Testsuite fixes

trying to figure out some race conditions happening in the testsuite