API: Fix unit test and update for recent core change
Change-Id: I36f2172acc066b2261e60531b20d7099aea36f6a