Migrated more tests