ticket:13 tests
ticket:13 implementation
Merge branch 't13_client'