test suite: fix bugs introduced in ad66a7bb and fe221bbc that broke parallel processing of test suite