Sync current version
Fix port-number confusion; renable testing of protocols
Remove diagnostic output
Misc changes to unit-tests

Fix a broken unit-test (makes wrong assertion)

Fix unit-test (ensure unit-test completes)

Tidy up names
SDC: update to use queues