Merge "Add Ports client unit tests"