Fix tests.

We're not gating yet - this skew crept in.

Change-Id: I97b064f6d0cb75bf80b423951101687b6d26d90c