Tweak some tests

Change-Id: I5f57b452c984335e9d94845260a0352c42aa5d26