Improve test verification from r209172