Altered some unit tests that don't pass on gcc.