diff --git a/bundle/config/loader/process_include_test.go b/bundle/config/loader/process_include_test.go
index 85adac2d9..7f2ff2a44 100644
--- a/bundle/config/loader/process_include_test.go
+++ b/bundle/config/loader/process_include_test.go
@@ -36,7 +36,7 @@ func TestProcessInclude(t *testing.T) {
 	assert.Equal(t, "bar", b.Config.Workspace.Host)
 }
 
-func TestProcessIncludeFormatPass(t *testing.T) {
+func TestProcessIncludeFormatMatch(t *testing.T) {
 	for _, fileName := range []string{
 		"one_job.job.yml",
 		"one_pipeline.pipeline.yaml",
@@ -46,7 +46,7 @@ func TestProcessIncludeFormatPass(t *testing.T) {
 	} {
 		t.Run(fileName, func(t *testing.T) {
 			b := &bundle.Bundle{
-				RootPath: "testdata/format_pass",
+				RootPath: "testdata/format_match",
 				Config: config.Root{
 					Bundle: config.Bundle{
 						Name: "format_test",
@@ -61,7 +61,7 @@ func TestProcessIncludeFormatPass(t *testing.T) {
 	}
 }
 
-func TestProcessIncludeFormatFail(t *testing.T) {
+func TestProcessIncludeFormatNotMatch(t *testing.T) {
 	for fileName, expectedDiags := range map[string]diag.Diagnostics{
 		"single_job.pipeline.yaml": {
 			{
@@ -201,7 +201,7 @@ func TestProcessIncludeFormatFail(t *testing.T) {
 	} {
 		t.Run(fileName, func(t *testing.T) {
 			b := &bundle.Bundle{
-				RootPath: "testdata/format_fail",
+				RootPath: "testdata/format_not_match",
 				Config: config.Root{
 					Bundle: config.Bundle{
 						Name: "format_test",
diff --git a/bundle/config/loader/testdata/format_pass/job_and_pipeline.yml b/bundle/config/loader/testdata/format_match/job_and_pipeline.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_pass/job_and_pipeline.yml
rename to bundle/config/loader/testdata/format_match/job_and_pipeline.yml
diff --git a/bundle/config/loader/testdata/format_pass/multiple_resources.yml b/bundle/config/loader/testdata/format_match/multiple_resources.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_pass/multiple_resources.yml
rename to bundle/config/loader/testdata/format_match/multiple_resources.yml
diff --git a/bundle/config/loader/testdata/format_pass/one_job.job.yml b/bundle/config/loader/testdata/format_match/one_job.job.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_pass/one_job.job.yml
rename to bundle/config/loader/testdata/format_match/one_job.job.yml
diff --git a/bundle/config/loader/testdata/format_pass/one_pipeline.pipeline.yaml b/bundle/config/loader/testdata/format_match/one_pipeline.pipeline.yaml
similarity index 100%
rename from bundle/config/loader/testdata/format_pass/one_pipeline.pipeline.yaml
rename to bundle/config/loader/testdata/format_match/one_pipeline.pipeline.yaml
diff --git a/bundle/config/loader/testdata/format_pass/two_job.yml b/bundle/config/loader/testdata/format_match/two_job.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_pass/two_job.yml
rename to bundle/config/loader/testdata/format_match/two_job.yml
diff --git a/bundle/config/loader/testdata/format_fail/job_and_pipeline.experiment.yml b/bundle/config/loader/testdata/format_not_match/job_and_pipeline.experiment.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/job_and_pipeline.experiment.yml
rename to bundle/config/loader/testdata/format_not_match/job_and_pipeline.experiment.yml
diff --git a/bundle/config/loader/testdata/format_fail/job_and_pipeline.job.yml b/bundle/config/loader/testdata/format_not_match/job_and_pipeline.job.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/job_and_pipeline.job.yml
rename to bundle/config/loader/testdata/format_not_match/job_and_pipeline.job.yml
diff --git a/bundle/config/loader/testdata/format_fail/multiple_resources.model_serving_endpoint.yml b/bundle/config/loader/testdata/format_not_match/multiple_resources.model_serving_endpoint.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/multiple_resources.model_serving_endpoint.yml
rename to bundle/config/loader/testdata/format_not_match/multiple_resources.model_serving_endpoint.yml
diff --git a/bundle/config/loader/testdata/format_fail/second_job_in_target.job.yml b/bundle/config/loader/testdata/format_not_match/second_job_in_target.job.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/second_job_in_target.job.yml
rename to bundle/config/loader/testdata/format_not_match/second_job_in_target.job.yml
diff --git a/bundle/config/loader/testdata/format_fail/single_job.pipeline.yaml b/bundle/config/loader/testdata/format_not_match/single_job.pipeline.yaml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/single_job.pipeline.yaml
rename to bundle/config/loader/testdata/format_not_match/single_job.pipeline.yaml
diff --git a/bundle/config/loader/testdata/format_fail/two_jobs.job.yml b/bundle/config/loader/testdata/format_not_match/two_jobs.job.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/two_jobs.job.yml
rename to bundle/config/loader/testdata/format_not_match/two_jobs.job.yml
diff --git a/bundle/config/loader/testdata/format_fail/two_jobs_in_target.job.yml b/bundle/config/loader/testdata/format_not_match/two_jobs_in_target.job.yml
similarity index 100%
rename from bundle/config/loader/testdata/format_fail/two_jobs_in_target.job.yml
rename to bundle/config/loader/testdata/format_not_match/two_jobs_in_target.job.yml