Cleanup tests for timeout overrides
Merge pull request #175 from wpreul/master

Cleanup tests for timeout overrides