Fixes tests and adds DateTimeImmutable
Merge remote-tracking branch 'origin/master'