Reverting to single-threaded tests