Squashing more race conditions under SLOW running tests