Merge branch 't13_customer'
Merge branch 't13_customer'
ticket:13 test fixes