This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
Closes #4348
Reported-by: Zenju on github Test 244 added to verify Fixes #1974 Closes #1976