Fixed relationship type, enhanced test cases