Fix and Move Test Fallback Logic to Server
Merge pull request #384 from javierluraschi/LegacyHostFix

Fix and Move Test Fallback Logic to Server