Minor logic/test clean-up post rebase

Minor logic/test clean-up post rebase #5564