RAYO-88 :  Fix failing tests on the latest prism build and trunk