62 [Sophie]  Adding controller tests and refactoring