LPS-50049 Refactor portal-service unit tests pt.1
LPS-50049 Refactor portal-service unit tests pt.2