use saturating add to fix crash

-equivalent spot in encoder code uses that too
-also remove two excessive tests()'s