Important bugfix to fix #increment
Cleaned up tests for brevity and stricter requirements
Reverted #decrement back to old structure due to slowness with large increment batches
Increment version