Make check-below-tests check more things and give more debug info.

Pulling commits out of the bigger PR.