Bugfix: The server catch-all was broken
Hardened the server-fallback system test