* Use SDK contracts (test needs fixing) * Fix tests * Add customQueryParametersMiddleware * Fix merge conflicts