Refactored cluster behaviour to support multiple deployment configurations during a test