fixed tests for 2.5/2.6