renaming test
Changing operand pattern.
Going all Python3.