Cxx 440: Fix tests for 2.2

Should we somehow assert that we only reach this branch if we are running against 2.2?