MDL-41940 files Additional behat cleanup

Fixing components and Given/When/Then styling.