[test/spec] Migrate a few files to the new style