Fix broken template reference and tests