Some test simplifications.