Simplify jiffy conversion + tests
merged gar1t changes