auto test fixes
fixes on the client and server side