ticket:9 Fixed ticket's unittest
ticket:9 Fix conflicts