airity tests and template tests now passing