Uncomment test code
Add support for "now"