Some cleanups to style/tests for your consideration

Steve, could you please take a look at this and merge these changes into your branch so we can land them with PR #9854