Messed up merge.  Fixed.
Adding tests for server and git_client