Update failing test for #54
Merge pull request #64 from jordoh/failing_timeout_test_update

Update failing test for #54