Merge "Tweak/Fix ObjectTest."