Improved rounding code but some unit test fail

Need to work a bit more on the rounding of all units (instead of the one
just after the last unit to display)