fix dependency and unit test from portal-core sync