Implement more support for using test data with multiple runs of OutputEngine