Add portal-test workspace to try to fix problem with unit test
Fix test fail after merge kill-exobuild