TestObject: Fixing merge issue