[Minor] Change comments and increase timeout period slightly