Another Refactoring and Workingday-Test adapted