Undo some testing configs. Fix bugs where rpc calls don't use merged configs when they should