fix tests for controller behaviour.