Dont store Timespan in ValidUntil

Fixes #178

also added some unit tests which illustrate some other bugs
Sorry @SimonCropp, missed that.
In that case I think we should fix it as well