Merge pull request #21 from garretraziel/master

some corrections in test_client.py
fix remaining tests