Reworked tests to use top-level 'Convey' methods; prepared reset tests.