Couple of test fixes for r176671.

Not sure why these aren't failing on my linux machine, but this should cover
it.