Moved things around so that the execution tests can invoke Convey and Reset directly. This makes our tests more representative of actual usage.