separated wiki tests, added benchmarks
Merge branch 'master' into wikitest
Merge branch 'master' into wikitest
Merge pull request #195 from tux21b/wikitest

wikitest: a small test-suite containing benchmarks