Just updated to re-throw when in testing mode, and assert otherwise.