cleaned up test_client and added more coverage