Made minor changes with testCalc and added files from lab demo