updated operators and tests