Time related test fixes

Lots of tests broke as we progress past the 4th/6th of April and the changes came into effect.

Lesson learned: Timecop all the things.