Improve error messages and add unit tests
Include body in proxied request