Updated templates, made template conversion seamless, added more tests