added associations and tests
Merge pull request #15 from Cynaria/association_tests_dw

added associations and tests