This makes the tests easier to copy and relocate to other test numbers without having to update content. Closes #6738
Test 585 and 586 were added. Using a modified lib500.c