Tuned the tests so they are PY3 compilant.