Tidy some tests
Merge pull request #660 from SemanticMediaWiki/tests

Tidy some tests