Updating the relationship class and the tests