Update tests to reflect fixed templates