Updated unit-tests, they work on Python 2.7