This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
of the patch he suggested. Added his test case as test289 to verify.