Refactoring holiday tests