Fix config and improve behat tests