some fix in test
fix function call on mapping