Bug fixes to work with test files
Bug fixes to work with test files