Merge "Mark connectivity module tests as such"