Merge "Rename ObjectFactoryTest_Fixture to camel case name"