Migrating more tests