Controller tests fixed