finalise folder names and check for templates tests