Updating unit tests to account for configuration overrides