Rejiggering tests a bit.