Resolve unit test regressions. Comment added to note the original bug report was wrong.