Cleanup tests, remove proxyObject for real