Improved pyhon 3.2 compatibility.
Corrected directory of test data in tests.