Tidy up

Rename for consistency
Merge pull request #150 from SemanticMediaWiki/tests

Tidy up