4ca182bf04
We haven't been doing it consistently, let's do it in the base test. Change-Id: I5b48a7147c32313a9678e54ab8896e9f301f1c04