Index: src/tests/.expect/time.x64.txt
===================================================================
--- src/tests/.expect/time.x64.txt	(revision 17417cf22d115c461bae828670325c365c54b22b)
+++ src/tests/.expect/time.x64.txt	(revision 9f652a160f8cc441a101e450f389d24a0091e381)
@@ -6,6 +6,9 @@
 
 Fri Jan  2 00:00:00.01 1970
-Fri Jan  2 00:00:14.01 1970 0 Fri Jan  2 00:00:15.01001 1970 104414010000000
+Fri Jan  2 00:00:14.01 1970 104414010000000
+Fri Jan  2 00:00:14.01 1970 104414010000000
+0 Fri Jan  2 00:00:15.01001 1970 104414010000000
 yy/mm/dd 70/01/02 mm/dd/yy 01/02/70 mm/dd/yy 01/02/70 dd/yy/mm 02/01/70
+Wed Jul  4 00:00:01 2001 994219201000000000
 Wed Jul  4 00:00:01 2001 994219201000000000
 
Index: src/tests/time.c
===================================================================
--- src/tests/time.c	(revision 17417cf22d115c461bae828670325c365c54b22b)
+++ src/tests/time.c	(revision 9f652a160f8cc441a101e450f389d24a0091e381)
@@ -10,6 +10,6 @@
 // Created On       : Tue Mar 27 17:24:56 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Mar 27 17:27:26 2018
-// Update Count     : 2
+// Last Modified On : Sun Apr  1 21:49:51 2018
+// Update Count     : 12
 // 
 
@@ -18,5 +18,5 @@
 
 int main() {
-	Duration d1 = 3`h, d2 = 2`s, d3 = 3.07`s, d4 = (timeval){ 12 }, d5 = (timespec){ 1, 10000 };
+	Duration d1 = 3`h, d2 = 2`s, d3 = 3.07`s, d4 = 12`s, d5 = 1`s + 10_000`ns;
 	sout | d1 | d2 | d3 | d4 | d5 | endl;
 	int i;
@@ -34,5 +34,8 @@
 	sout | t | endl;
 	t = t + d1;
-	sout | t | t - t | t + d5 | t.tv | endl;
+	sout | t | t.tv | endl;
+	Time t1 = (timespec){ 104_414, 10_000_000 };
+	sout | t1 | t1.tv | endl;
+	sout | t - t  | t + d5 | t.tv | endl;
 	char buf[16];
 	sout | "yy/mm/dd" | [t, buf]`ymd;					// shared buf => separate calls
@@ -41,6 +44,6 @@
 	sout | "mm/dd/yy" | buf;
 	sout | "dd/yy/mm" | [t, buf]`dmy | endl;
-	Time c = { 2001, 7, 4, 0, 0, 1, 0 };
-	sout | c | c.tv | endl;
+	Time t2 = { 2001, 7, 4, 0, 0, 1, 0 }, t3 = (timeval){ 994_219_201 };
+	sout | t2 | t2.tv | endl | t3 | t3.tv | endl;
 	sout | endl;