Added correlation id to rpc errors
Added missing tests