-intermediate
-decoupled test from implementation
-decoupled test from implementation
-cleanup
-bug fix on widget scaling. Problem: No corresponding test