migrated more tests