another fix to class Time and related classes and unit tests