tests for ezproxy stuff
Merge branch testing into master