ticket:13 test fixes
Merge branch 't13_customer'