multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics