PIM-3475: Fix export behat and polish