Adds Coverage Enforcement for Tests
Merge pull request #205 from sudorandom/master

Adds Coverage Enforcement for Tests
Converts several try/except to the newer style