Allow to override insert
Fix test suite