back to general RPC; error messages; test fixes