Fix import numbers
Split test cases
Fix operators

In ca06ffb6131fb0ebdac6edabcbcacd78ac979628 changes were made to the
operators as well. There were some errors in those changes.