Fix 3 for compilation issues in make test