More test consolidation.