Fixing some compilation issues with the tests.