This fixes a few bugs that became apparent with the
reinstating of a test.

Bug: 11954718
Change-Id: I1127bc3180f856566429f40d14c944e6f0007e09