Actually fixing tests for gcc 4.4 :-P