Tests now have timeouts
Merge pull request #3 from onionjake/master

Tests now have timeouts