Fix some tests and controller. Wednesday 18:41