Fixed tests to support Python 3.x