fixes for the unit conversions; test cases for the same pieces of code