SimplifyCFG: Add missing tests from r187278