re-adding 2.6
fixing tests, re-adding 2.6