Add test suite (working on cleaning up template output)