- Changes for better support of structured source data
- More complete metadata in test file and tests