Make server a bit more stable if body field cannot be parsed
Update test file to match code changes