Add more api unit tests

Just to impove the test coverage.

Change-Id: I9568b9fc4333f659b0146459ff9c12e4dae61db1
Merge "Add more api unit tests"