Added port number parameter unit testing
Merge branch 'master' into build