Adding VariableFactory and test, ComparisonOperatorFactory and test