Fixing 2.6 tests