Adjusts tests for avoid timeline4 intermittent failures