Changes to waits for FilterTests.