removed binary operators and renamed tests