Migrated some tests