Further fixes to Duration unparse code; and more regression tests and internal tests