fixed random test failures due to bad timeouts