fix testsuite for multiple tests in a suite
try to dry up tests again
adjust timeout to 30 seconds