ticket:1 add tests
ticket:1 finished task
Merge branch 't1_nethen'