Initial fix for Calculus of test