Tweak testing setup.

Change-Id: I84138d9fcba5135c0b8f2ad1754acf266df5baf9