Combine two unit test together and rename the class the name.
+ Add null-value check for value in Attribute in evaluator query
+ Found some case insensitive behavior in matching attribute and removed it .
+ Fix up the unit test.