change default timeout. and fix test comment