Fix and tests for incrementor.