WIP Tests working
Refactor widget controller tests
Merge branch 'feature/refactor-widgets_controller-tests' into develop

* feature/refactor-widgets_controller-tests:
  Refactor widget controller tests
  WIP Tests working