Close #30: Add test and fix for bad decrement code