Feature/timeout tests

Cleaned up the tests a little.

Added some tests for timeouts added in: #130