fixed tests for 2.6