Attempting to fix sporadic test failures