14 green tests, refactored
before adding date