Convert more helpers to the new scheme
drwxr-xr-x - testsuite