Fix tests
Server tests
Server handler tests