Switching back to throwables due to better error processing.
Updating jUnit test cases.