Fixed ServerTools, added unit test