ticket:13. add tests
ticket:13. done
Merge branch 't13_client'