Updated to work with tests (no sequence numbers)