reorganized tests to support jinja2 templating