Updated unit names.
Added a test to see what's going wrong still.