Get rid of AjapTemplate. Adds @Template unit tests