MULE-7232 - fix broken test cases because of wrong merge