In addition to changes just recently added this includes 2 more fixes

Removed test printing line and changed exception test try statement to have better syntax.