Fix all the failing tests.

Change-Id: I45888de097641633ba6b3b111657ca7fc50615c5
26 files changed