Make tests a bit more general.