test fixes
Merge branch 'emma' of github.com:intermine/intermine into emma
Checkstyle