After review: code cleanup; ClientTest needs to be rewritten as integration test