Retaining BC for .{_format}

References #422, this change continues with the improvement from #422, but retains BC with prior behavior
Merge pull request #428 from intel352/patch-1

Retaining BC for .{_format}
Fixing test expectation for .{_format}

References #422, #428 (#428's fix for #422 failed to include correction to test)
Merge pull request #429 from intel352/patch-2

Fixing test expectation for .{_format}