#4 #2 Date working
#4 #2 Improving tests
close #5