P1D#2 [Jonah, Tsatsi, Tshepo] Refactored controller and controller tests