Add extra test coverage with cases that showed mis-compiles in earlier versions of an upcoming patch. Also add tests for integer phis
