Some test clean-up
Move some tests
Some renaming
Merge pull request #318 from SemanticMediaWiki/tests-clean-up

Tests clean up