Add a few more tests. Plus HTML template support.