Refactored cluster/join tests.