Fix for test compilation problems.