WIP fixing problem with generated templates (bad namespacing)
d
fixed bad string in output file; fixed tests