Refactoring arguments to simplify clusters' implementation
Fixing arguments error found in tests