Controllers tests fixed