Date generator tests
Refactoring
Stylecopping