Merge "Fix raise syntax in test.py for python3 compat"