Operator tests cleaned up