Fixed tests for 2.6