added test for 2 vars; cleaned-up twig file