refactor according to rachel suggestions
Merge pull request #44 from dglunz/integration_test_relationships

refactor according to rachel suggestions