Refactoring: remove redundant logic

Split repetetive test logic into a helper method.
Add a method to test date_start, and date_end but no date_delta