Started adding structure to allow for separate protocol tests, with