Test fix and generic type update for ConditionEvaluationHandler