Tests
Merge branch 'widget-refactor'