Add explicit timeouts to tests
Merge pull request #72 from goinstant/jbowes/test-timeouts

Add explicit timeouts to tests