Fix tests for 2.5.x