Merge "Add unit test for portal in dashboard"