Making tests 2.6 compatible