KRACOEUS-7109 : Cleaning up KeyPersonnelService and fixing unit tests