RelationTests added. Improvements