Fixes for failing tests caused by the property deduplication during migration.