improved incr interface and tests