Can you add some tests for this manager method (and the other datetime methods you are changing)?