Optimisation to Future.run for the Now instance and some extra tests.

Was previously created, but needed to be separated out from previous work.