Minor edits to tests in response to PR comments