Rename file.  Add default in case of `if` failure.
Fixes discovered during unit testing.
Fixes discovered during unit testing.
Update unit and integration tests to work with updated methods