Clean up and update the Calc, slider, and progress bar tests