Fixing test compilation issues.