Fixing some tests which were too sensitive to timeout values.