Improved exception tests

We should make sure the tests fail if an exception that should be thrown
is not thrown.
Merge pull request #257 from GrahamCampbell/2.0-exception-tests

[2.0] Improved Exception Tests
Merge remote-tracking branch 'origin/2.0'