Initial test restructuring, templates for generating test files