WeekToGoTest small refactoring