Fix Map equality bug with null values. Improve coverage