Merge pull request #74 from leider/master

Many more client-side tests
more client side tests
merge
Merge remote-tracking branch 'upstream/master'