Added relationship status to user, mapper  + unit tests