put default dict back, remove mapping_iterator
add more tests