Make tests more concise