Improve MainCtrl tests

Description:
They're still broken, but they're better.