Actually fixing tests for gcc 4.4 :-P
Fixing tests for gcc 4.4 - this time for real
Replaced deprecated config macros

Signed-off-by: K-ballo <k@fusionfenix.com>