Moved tests to widgetTests (and some updates)