PIM-2312: Make behat scenarios pass