Fix some L2GW test cases for existing connections