ticket:1 fix unit tests
Merge branch 't1_contact'