moved dependencies, messed with testing
added meters, changed conversion equations uncommented tests