WeekToGoTest refactoring