Fix broken Controller tests