This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
Add libtest 661 Closes #4417