MULE-7572 Revert change made in fbce0106af13818c6bb813301bee24ed75ce2e69...

... and fix test method