Revert "- Services get proxied. Lets not be so picky."

This reverts commit 1ed7f8cbd322ae87321da3b251092248aed4bba1.
Do not have try / catch around whole test