Test clean up. Also raised model argument from set to collection.
Merge branch 'emma' of github.com:intermine/intermine into emma