Merge "Increased coverage of InheritanceUtilsTest."