Uplink reset

Fix a long-present bug and add an extra test for that.