fixing problems with multi-threaded test runs