Accept optional minutes in definition
refactored tests and removed double inclusion of end time