FIX more flaky tests