Adjust controller specs to new behaviour.