[RIC-587] Refactor and add E2 Setup UTs