fixed unstable proxy and updated tests