More minor test repairs.