Fix #274

So it can be tested, as you note below if using now() it will be really hard to test.