5.6.x Fix tests