issue 404: refactor upstream tests