Fix calculations, and add tets for U.S. customary units.