MULE-7837: Comments added to make logic clearer, constants added to test case, all according to PR comments.