Fix unit tests and compile warnings.

Change-Id: I25f9df121f30182a470f678f9f8afbf3831f45f2
4 files changed