merge
Fix test for specifying port