made some tweaks to qCalc and trig, modified tests to fit them