Apply my personal fixes to the test suite.

To cope with access to private API that doesn't exist in our implementation.

Change-Id: I21fb0c38a0f31950783d7aa09f830bfae6d38388
3 files changed