D6: Add support and test cases for decrement and increment