Remove outdated comment.
Restore cheap test timeout to original value.