Tests modified to support Python 2.6