Revise structure of calculation templates. Fix JC and psptest. Others still broken probably