rename entity mapping
add more entity mapping test cases and ignore