Added timeout option and upped the test timeout.