Raised argument from Set to Collection
Test cleanup
Fixed broken test.
Merge branch 'emma' of github.com:intermine/intermine into emma