Minor formatting and test fixes after the addition of the no-upstream flag

Description (e.g. "Related to ...", etc.)

[ ] Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR)
[ ] Title summarizes what is changing
[ ] Commit messages are meaningful (see this for details)
[ ] Tests have been included and/or updated, as appropriate
[ ] Docstrings have been included and/or updated, as appropriate
[ ] Changelog has been updated, as needed (see CHANGELOG.md)