Fixed #7389.  The now() function is now available and tested.
Some fixes that make it easier to test.  This fixes #7382, as it is now easier to test.