PIM-1245 : Fix some issues on behat scenarios