Make tests more general