correct some nits in comment and test files Upstream-commit: 2e752540bf41e8abc4a641a5616890db4159c2d8 Component: engine