Merge "Fix testSetToNow0 test"