Merge "Fix tests to pass with VerifyObject."