diff --git a/pkg/builder/cbuildidx/builder_test.go b/pkg/builder/cbuildidx/builder_test.go
index dc9f625..cfc47c8 100644
--- a/pkg/builder/cbuildidx/builder_test.go
+++ b/pkg/builder/cbuildidx/builder_test.go
@@ -342,3 +342,18 @@ func TestValidateNinjaVersion(t *testing.T) {
 		assert.False(output)
 	})
 }
+
+func TestHasExecutes(t *testing.T) {
+	assert := assert.New(t)
+
+	b := CbuildIdxBuilder{
+		builder.BuilderParams{
+			Runner:    RunnerMock{},
+			InputFile: filepath.Join(testRoot, testDir, "Test.cbuild-idx.yml"),
+		},
+	}
+
+	t.Run("validate solution has executes nodes", func(t *testing.T) {
+		assert.True(b.HasExecutes())
+	})
+}
diff --git a/pkg/builder/csolution/builder_test.go b/pkg/builder/csolution/builder_test.go
index 9402a97..7b7a0a2 100644
--- a/pkg/builder/csolution/builder_test.go
+++ b/pkg/builder/csolution/builder_test.go
@@ -262,11 +262,17 @@ func TestBuild(t *testing.T) {
 	})
 
 	t.Run("test build csolution using cbuild2cmake", func(t *testing.T) {
-		b.Options.Contexts = []string{"test.Debug+CM0"}
+		b.Options.Contexts = []string{}
 		b.Options.UseCbuild2CMake = true
 		err := b.Build()
 		assert.Error(err)
 	})
+
+	t.Run("test build csolution with target option", func(t *testing.T) {
+		b.Options.Target = "CMakeTarget"
+		err := b.Build()
+		assert.Error(err)
+	})
 }
 
 func TestRebuild(t *testing.T) {
diff --git a/test/data/Test.cbuild-idx.yml b/test/data/Test.cbuild-idx.yml
index 656020d..1812fa8 100644
--- a/test/data/Test.cbuild-idx.yml
+++ b/test/data/Test.cbuild-idx.yml
@@ -19,3 +19,6 @@ build-idx:
     - cbuild: cm4/HelloWorld_cm4.Release+FRDM-K32L3A6.cbuild.yml
       project: HelloWorld_cm4
       configuration: .Release+FRDM-K32L3A6
+  executes:
+    - execute: Test
+      run: ${CMAKE_COMMAND} -E echo "Test"