Make behat tests pass for 2 use cases