Fixed client test, removed unused code.