Merge "Disabled tests for unused cluster models"