Added try catch statements to the tests, prevents on failing test from timing out the others
Merge pull request #165 from JGulbronson/master

Added try catch statements to the tests.