[#55278456] updated template measures and tests

Removed CCLI
[#55278456] made corrections per Dan's comments
Few more tweaks

[#55278456]
Merge pull request #445 from NREL/55278456-Update-Measure-Templates

[#55278456] updated template measures and tests