Revise network.py to support per-run and overall test criteria (New)

Revise network.py to support per-run and overall test criteria (New) #2738