fix test while daylight saving + refactoring, PLAYGROUND-308