Fix these tests.

Done by improving use of DummyObject store (which seems to have changed
its behaviour recently...)
Fix web output tests
Merge branch 'emma' of github.com:intermine/intermine into emma