Relation class tested and modified