migrated some more tests