Add Server.clear() and fix tests