added tests & mapping