Tweak some tests

Change-Id: Ie708e146f9ba8321555a40c56ef82cea2e0813ea