Added missing auth fields. removed @override. added a model mapping util test