Added test_units for conversion functions
Nicer formatting for test_battery