Removed redundant class vars
Fixing tests to run on PY26>PY33