Moving some server tets into server_test