fixed 2 tests and dropped 2.6 support