Update tests to avoid timeouts in firefox.