Fix new tests under 2.x