Remove depreacted tests.
Automatic Py3k merge for testing