add test cases
add field mapper