Update MoabLicenseMapper, add test