Added support for compound templates in tests