Update current tests to validate objects came back correctly.
Commit necessary tests for end result.
Update relationships to be more object oriented.