Merge "Additional test cases for port forwardings API"