Merge "Cleanup widgetsModel and add tests" into main