Merge into a single test.

These three tests really did test the same, merge them to
save test run overhead.
Change to shorter test case numbering.

I think up to a hundred test cases should be sufficient here.
Minor modernisation.
Forgotten ignore from two commits ago.
Update to shorter test names.
Finalise testcase renumbering.