Fix JsonIdMap null value and improving coverage