Fixed tests on 2.6