Adjust tests to fix intermittent failures of timeline8