Client work with upgrade fixed, tests fixed