Added opearator creation and more testing code.