refactor ControllerTask::bakeActions

Rather than bake in 2 steps - bake in one. This should resolve the remaining phpcs fail/warning from #5249.

In the process, found a few more tests that should have been converted to file comparisons.