fix test timeout issues