finished more or less porting tests, tpls converted to twig