Refactored Measurements into their own class.\n  Fixed Tests so they pass\n