- Fix error in combine function
- Finish adding quantity math tests