Changes for mapping with behat tests