This is not meant to be comprehensive, just the few cases where the /bin/sh -c wrapper is obviously superfluous.
This makes rename the test units by a consistent naming scheme, add several logs, and sort internal functions. No functional change.