Fix check strings in test case and use llvm::to_string instead of

std::to_string.

These changes were needed to fix bots that started failing after
r315045.

llvm-svn: 315046