ticket:6 fix test
Merge branch 't6_widget'