fix Server, tests partially works, mutation problem