Updated exception assert to return the exception, and added appropriate tests
Merge branch 'release/0.0.1'