3.0 bake test fixes

Fix the phpcs fixes (to bake test files and bake output) now visible due to #5249