Intermediate commit
[#75135688]
Working on template measures

[#75135688]
Moving test files

[#75135688]
Final location

[#75135688]
Getting very close

[#75135688]