Fixes to unit tests to match the current output.
Additional tests to validate new modes: Multiple template files, sub-assemblies