Fix behat scenario related to having multiple grids in the same page
Fix behat test
Fix behat scenario
Added unit test
Added unit test
Added tests and fixed CS
Merge branch 'master' into refactor/product_manager