Improve Test class ability to validate unary relationships