This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
Prevent both --fail and --fail-with-body on the same command line. Verify with test 349, 360 and 361. Closes #6449