Fixed tests to be python2.5 compatible - #18602