Added statements to template compiler, updated tests