[test/spec] Migrate a few more files