Speculatively fix more tests for implicit int changes

This should hopefully address the issues found by:
https://lab.llvm.org/buildbot/#/builders/105/builds/24927
https://lab.llvm.org/buildbot/#/builders/174/builds/8906
6 files changed