Add the skeleton for keep_test, and make a small change to client_test