Added missing relationships and tests
Merge pull request #2 from Aphin715/general_survey

Added missing relationships and tests