updates failing test for differently named associations
Merge branch 'master' of github.com:recombinary/journey