finally: first tests for the wiki
small refactoring