Marked expected test failure unique to Image Engine internal builds.
Fixed failing ParameterisedHolder test cases.

They were relying on an op which is no longer installed with Gaffer.
Merge pull request #962 from johnhaddon/testCleanup

Test cleanup