Fix and Move Test Fallback Logic to Server