Making TestValidateProxies pass for CORE + Python + MPI build. Moving proxy definitions around as needed.