fix tests for 2.6 compliance