User logic and fixed tests
Fixed date in tests
Warning Message
Refactor
Comments