Fleshed out client test stuff (currently broken).