Get rid of operator prefixing in tests
Use better names for test values