Fix tests for 2.11