Initial fix for calculus test class