Fixed tests speed by removing redundant cluster checks