get tests the right way around, and add field to non-proxy
merge proxy operations with their real versions
friendlier error message