fix failing calendar scenarios