accidental commit
accidental commit
fixed broken test and added Time unit tests