diff --git a/cmd/testrunner.go b/cmd/testrunner.go
index 103a005d4f..aa4a74fe32 100644
--- a/cmd/testrunner.go
+++ b/cmd/testrunner.go
@@ -76,7 +76,7 @@ func testTypeCommandActionFactory(testType testrunner.TestType) cobraext.Command
 			return errors.Wrap(err, "unable to determine test folder paths")
 		}
 
-		if failOnMissing && len(testFolderPaths) == 0 {
+		if failOnMissing && len(testFolders) == 0 {
 			if dataset != "" {
 				return fmt.Errorf("no %s tests found for %s dataset(s)", testType, dataset)
 			}
diff --git a/internal/kibana/ingestmanager/policies.go b/internal/kibana/ingestmanager/policies.go
index 59c02be468..e95f85d7ee 100644
--- a/internal/kibana/ingestmanager/policies.go
+++ b/internal/kibana/ingestmanager/policies.go
@@ -51,7 +51,7 @@ func (c *Client) post(resourcePath string, reqBody io.Reader) (int, []byte, erro
 	url := path.Join(c.apiBaseUrl, resourcePath)
 	req, err := http.NewRequest(http.MethodPost, url, reqBody)
 	if err != nil {
-		return 0, "", errors.Wrapf(err, "could not create POST request to Ingest Manager resource: %s", resourcePath)
+		return 0, nil, errors.Wrapf(err, "could not create POST request to Ingest Manager resource: %s", resourcePath)
 	}
 
 	req.SetBasicAuth(c.username, c.password)
@@ -70,13 +70,13 @@ func sendRequest(req *http.Request) (*http.Response, int, []byte, error) {
 	client := http.Client{}
 	resp, err := client.Do(req)
 	if err != nil {
-		return nil, 0, "", errors.Wrap(err, "could not send request to Kibana API")
+		return nil, 0, nil, errors.Wrap(err, "could not send request to Kibana API")
 	}
 
 	defer resp.Body.Close()
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return resp, resp.StatusCode, "", errors.Wrap(err, "could not read response body")
+		return resp, resp.StatusCode, nil, errors.Wrap(err, "could not read response body")
 	}
 
 	return resp, resp.StatusCode, body, nil
diff --git a/internal/testrunner/runners/system/system.go b/internal/testrunner/runners/system/system.go
index f235baedad..e1d795b46f 100644
--- a/internal/testrunner/runners/system/system.go
+++ b/internal/testrunner/runners/system/system.go
@@ -80,16 +80,18 @@ func (r *runner) run() error {
 		return errors.Wrap(err, "could not create ingest manager client")
 	}
 
-	policy := ingestmanager.Policy{
+	p := ingestmanager.Policy{
 		Name:        fmt.Sprintf("ep-test-system-%s-%s", r.testFolder.Package, r.testFolder.Dataset),
 		Description: fmt.Sprintf("test policy created by elastic-package test system for data stream %s/%s", r.testFolder.Package, r.testFolder.Dataset),
 		Namespace:   "ep",
 	}
-	policy, err = im.CreatePolicy(policy)
+	policy, err := im.CreatePolicy(p)
 	if err != nil {
 		return errors.Wrap(err, "could not create policy")
 	}
 
+	fmt.Println(policy)
+
 	// Step 4. (TODO in future) Optionally exercise service to generate load.
 
 	// Step 5. Assert that there's expected data in data stream.
diff --git a/internal/testrunner/testrunner.go b/internal/testrunner/testrunner.go
index d0777f95bf..1a861b0bce 100644
--- a/internal/testrunner/testrunner.go
+++ b/internal/testrunner/testrunner.go
@@ -51,7 +51,7 @@ func FindTestFolders(packageRootPath string, testType TestType, datasets []strin
 		return nil, errors.Wrap(err, "error finding test folders")
 	}
 
-	folders := make([]TestFolder, len(matches))
+	folders := make([]TestFolder, len(paths))
 	for _, p := range paths {
 		parts := filepath.SplitList(p)
 		pkg := parts[0]