Make tests more compact