Simplify jiffy conversion + tests