Merge recent changes
Reenable crate map tests