Fix failing tests.

Jenkins failed to test properly.

Change-Id: Idfa65de9f3c58de92be80bcc4536996da81b6f08