Merge "Add test for downstream tethering" into main