Fixed the Main Controller Tests