diff --git a/functional/core/core_feature.json b/functional/core/core_feature.json
index 9fa43152f..065b089f7 100644
--- a/functional/core/core_feature.json
+++ b/functional/core/core_feature.json
@@ -111,11 +111,11 @@
         "steps":[
             {
                 "key":"",
-                "value":"list repo",
+                "value":"list",
                 "action":"main"
             }
         ],
-        "result":"commons"
+        "result":"This command consists of multiple subcommands to interact with ritchie."
     },
     {
         "entry":"List repo",
@@ -128,6 +128,17 @@
         ],
         "result":"commons"
     },
+    {
+        "entry":"List credential",
+        "steps":[
+            {
+                "key":"",
+                "value":"list credential",
+                "action":"main"
+            }
+        ],
+        "result":"CONTEXT"
+    },
     {
         "entry":"Delete repo",
         "steps":[
diff --git a/functional/core/core_integration_test.go b/functional/core/core_integration_test.go
index 0d2236745..0f8705196 100644
--- a/functional/core/core_integration_test.go
+++ b/functional/core/core_integration_test.go
@@ -53,20 +53,21 @@ var _ = Describe("RitCore", func() {
 		// Entry(scenariosCore[4].Entry, scenariosCore[4]),
 
 		Entry(scenariosCore[5].Entry, scenariosCore[5]),
-		Entry(scenariosCore[6].Entry, scenariosCore[6]),
-		// Entry(scenariosCore[7].Entry, scenariosCore[7]),
-
+		// Entry(scenariosCore[6].Entry, scenariosCore[6]),
+		Entry(scenariosCore[7].Entry, scenariosCore[7]),
 		// Entry(scenariosCore[8].Entry, scenariosCore[8]),
-		Entry(scenariosCore[9].Entry, scenariosCore[9]),
-		// Entry(scenariosCore[10].Entry, scenariosCore[10]),
 
-		Entry(scenariosCore[11].Entry, scenariosCore[11]),
+		// Entry(scenariosCore[9].Entry, scenariosCore[9]),
+		Entry(scenariosCore[10].Entry, scenariosCore[10]),
+		// Entry(scenariosCore[11].Entry, scenariosCore[11]),
+
 		Entry(scenariosCore[12].Entry, scenariosCore[12]),
 		Entry(scenariosCore[13].Entry, scenariosCore[13]),
-
 		Entry(scenariosCore[14].Entry, scenariosCore[14]),
+
 		Entry(scenariosCore[15].Entry, scenariosCore[15]),
 		Entry(scenariosCore[16].Entry, scenariosCore[16]),
 		Entry(scenariosCore[17].Entry, scenariosCore[17]),
+		Entry(scenariosCore[18].Entry, scenariosCore[18]),
 	)
 })
diff --git a/functional/runner.go b/functional/runner.go
index b0c7bc47c..6773fe00e 100644
--- a/functional/runner.go
+++ b/functional/runner.go
@@ -30,7 +30,8 @@ import (
 )
 
 const (
-	rit = "rit"
+	rit     = "rit"
+	windows = runtime.GOOS == "windows"
 	// initCmd = "init"
 )
 
@@ -49,8 +50,7 @@ type Scenario struct {
 func (scenario *Scenario) RunSteps() (string, error) {
 	fmt.Println("Running: " + scenario.Entry)
 
-	os := runtime.GOOS
-	if os == "windows" && len(scenario.Steps) >= 2 {
+	if windows && len(scenario.Steps) >= 2 {
 		ginkgo.Skip("Scenarios with multi steps for windows doesnt work")
 		return "", nil
 	} else {
@@ -61,8 +61,7 @@ func (scenario *Scenario) RunSteps() (string, error) {
 
 func (scenario *Scenario) RunStdin() (string, error) {
 	fmt.Println("Running STDIN: " + scenario.Entry)
-	os := runtime.GOOS
-	if os == "windows" {
+	if windows {
 		b2, err := scenario.runStdinForWindows()
 		return b2.String(), err
 	} else {
@@ -73,8 +72,7 @@ func (scenario *Scenario) RunStdin() (string, error) {
 }
 
 func RitSingleInit() {
-	os := runtime.GOOS
-	if os == "windows" {
+	if windows {
 		setUpRitSingleWin()
 	} else {
 		setUpRitSingleUnix()
@@ -83,8 +81,7 @@ func RitSingleInit() {
 }
 
 func RitClearConfigs() {
-	os := runtime.GOOS
-	if os == "windows" {
+	if windows {
 		setUpClearSetupWindows()
 	} else {
 		setUpClearSetupUnix()