Making operator tests pass