Fixing bug in IRUtil that was causing test to fail for piecewise execution. Cleanup