fixed generator for table tests with multiple ports
Merge remote-tracking branch 'origin/master'