Shore up multithreaded tests