Added some more critic test templates.