Some test simplification.