widgetTest cleanup and improvements