Fixing tests for gcc 4.4 - this time for real