Make tests more self-documenting