fixed client-side unit tests
Merge pull request #903 from drewfish/unit-client

fixed client-side unit tests