facility/model tests pass
batches in/out pass, all current tests pass