Code refactory
Code refactory
Relationship tests and other measures