Improved OEMigrationTest