MULE-8028 - fix broken test cases