Fix issue with overflow subtraction
Upgrade test runner to use exceptions
Minor code improvement