Cxx 440: Fix tests for 2.2

How is this related to the 2.2 change?