Fixed mock failures related to output parameters