Tweaked factory and tests to work with updated date format