Removed mapping settings loader test and minor corrections.\n\nHelper was removed in previous commit.