Added Calories test with varied Incline/Weight/Speeds. Made some adjustments to some other tests to take into account what was talked with Sean in our last meeting