Tests on Client.
Merge pull request #33 from lingow/TestsOnClient

Tests on Client.