Fix a couple of test cases due to changes in xdebug (i assume at least)