Fix API tests for v2 version

Change-Id: I2e7b70d15de95639d1536fc3e2709dbbfc31002c
Merge "Fix API tests for v2 version"