MDL-41940 files Additional behat cleanup