Remove #proxyTestStubs in favor of inline solution