Clean up test output

Some of the API calls weren't mocked properly. Add the missing mocks so
the test output is again clean.

Change-Id: I83fff8ee3f63e79ef5786602d6516703a22f0702
Partial-bug: #1378907
Merge "Clean up test output"