Fix unit test references
Fix ascents tests
Rename templates