FWIW, the code we use for creating test sets for our e2e is not very ergonomic and it would be nice to polish it up in a reusable way that others can import.