Make tests a little more sane.