Enhancements for sub-assemblies, separate templates and updated tests

These examples should all use double quotes since we call it a json file, it should be valid json