Fixed tests for 2.9.x