Conversions: Adding more tests around units