ticket:6 tests
ticket:6 implementation
Merge branch 't6_form_widgets'