PIM-3247: Improve behat
PIM-3247: Fix grid bug