re #21 - adding tests support for python2.5