Updated tests for main controller