Small changes to Client and test

Added a test to Client and found some bugs as a result.  Should be
ready to go besides talking with Seth's server because it isn't created
yet.