Revert "Pull in minor test changes" because the build broke.

This reverts commit 7de6690bbfbc1021045399fedfdf5a8a2b13fc01.