Added 2.6 testing support