Fix incr and set bugs, add a few new tests for both and clean up tests using some new helper methods.