Enhancements for sub-assemblies, separate templates and updated tests

when would the filePath exist, but template wouldn't?