Fixed inconclusive tests and fixed a minor jinja template crash