Refractoring and add Operator/OperatorFactory test cases