Operator testing and resultant fixes