Adding/Refactoring unit test for ConditionEvaluator