Do some incremental work trying to improve the test script

Unfortunately it seems that phk broke how labels/partitions were created
in r113434 and the gap was never completed, so these testcases are broken.

Exit early