MDL-43839 behat: Other behat fixes (TO SQUASH)