Merge pull request #1424 from abarth/consolidate_tests

Consolidate widget tests