- Test Refactor
- Day refactor
safe substraction refactored and applied in a few places