Added tests for the `X-Vendor-App-Id` header and cleaned up other tests