Update to support test-fulfillment