Refactor failing mapping JS step definition
Refactor failing mapping with message JS step definition
Refactor failing mapping JS stepdefs