fixed all the tests under 2.6