Refactored test-server in preparation for using it as a module