Fixes for failing tests

Commit 1: A test got pulled in after the shutdown port PR was pulled in so it still attempted to pass that parameter.