MYLOC-119 - Fixing the controller tests