Refactoring, added TaskedServerTest