Add test for port 2736 behavior