Fix tests after moving the settings