Merge pull request #687 from leider/master

more tests in client
make tests less verbose