Fixed issues causing test failure including 1-1 relationships