Some cleanup and fixes to the runtests script. The -P option will be changing.