Fix a fail in test setup
Remove institucional folder from intranet because it already exists in portal
Fix merging conflict