Code cleanup
Change Relationship to be a public enum
Add tests