servers fixing, tests