Fixed PortalValueLoader failing unit tests