Make tests yet more data-driven