Fixed all tests except ContentMapperTest::testCopyExistingName