Make unit test pass again.
Behat tests for the settings + fixes.