PIM-3319: Fix behats and specs