[#72] Resolve templating bug and add unit tests to cover#73

raxod502 wants to merge 4 commits intomainradian-software/el-patch:mainfrom

rr-add-testsradian-software/el-patch:rr-add-testsCopy head branch name to clipboard