Some tweaks around time...

My dev box was 10 seconds behind GMT, and this caused the tests to fail...

This commit does not fix that issue, it's just a code tidy-up. For the
time being, I've just corrected my clock.