Refactored duration tests to make it simpler to add new ones. Added a few edge cases to test the replacement for the += 31 code