Fix bad stateful_proxy_test.cpp merge