fix testsuite for multiple tests in a suite
try to dry up tests again