Re-record zf2 tests and flakey list a file

Additional follow up to #3454 in addition to #3455.