More fixes to test for #1032 for gcc 4.4