some fixes to cluster unit tests

- each test has a corresponding cluster id
- no overlap in port ranges between tests
- other small embellishments