diff --git a/azure/context_test.go b/azure/context_test.go
index 9ddb928e3..486bb9445 100644
--- a/azure/context_test.go
+++ b/azure/context_test.go
@@ -34,16 +34,16 @@ import (
 
 type ContextSuiteTest struct {
 	suite.Suite
-	mockUserSelector       *MockUserSelector
+	mockUserPrompt         *mockUserPrompt
 	mockResourceGroupHeper *MockResourceGroupHelper
 	contextCreateHelper    contextCreateACIHelper
 }
 
 func (suite *ContextSuiteTest) BeforeTest(suiteName, testName string) {
-	suite.mockUserSelector = &MockUserSelector{}
+	suite.mockUserPrompt = &mockUserPrompt{}
 	suite.mockResourceGroupHeper = &MockResourceGroupHelper{}
 	suite.contextCreateHelper = contextCreateACIHelper{
-		suite.mockUserSelector,
+		suite.mockUserPrompt,
 		suite.mockResourceGroupHeper,
 	}
 }
@@ -79,7 +79,7 @@ func (suite *ContextSuiteTest) TestCreateNewResourceGroup() {
 	suite.mockResourceGroupHeper.On("GetGroup", ctx, "1234", "myResourceGroup").Return(group("myResourceGroup", "eastus"), nil)
 
 	selectOptions := []string{"create a new resource group", "group1 (eastus)", "group2 (westeurope)"}
-	suite.mockUserSelector.On("Select", "Select a resource group", selectOptions).Return(0, nil)
+	suite.mockUserPrompt.On("Select", "Select a resource group", selectOptions).Return(0, nil)
 	suite.mockResourceGroupHeper.On("CreateOrUpdate", ctx, "1234", mock.AnythingOfType("string"), mock.AnythingOfType("resources.Group")).Return(group("newResourceGroup", "eastus"), nil)
 	suite.mockResourceGroupHeper.On("ListGroups", ctx, "1234").Return([]resources.Group{
 		group("group1", "eastus"),
@@ -97,7 +97,7 @@ func (suite *ContextSuiteTest) TestSelectExistingResourceGroup() {
 	ctx := context.TODO()
 	opts := options("1234", "")
 	selectOptions := []string{"create a new resource group", "group1 (eastus)", "group2 (westeurope)"}
-	suite.mockUserSelector.On("Select", "Select a resource group", selectOptions).Return(2, nil)
+	suite.mockUserPrompt.On("Select", "Select a resource group", selectOptions).Return(2, nil)
 	suite.mockResourceGroupHeper.On("ListGroups", ctx, "1234").Return([]resources.Group{
 		group("group1", "eastus"),
 		group("group2", "westeurope"),
@@ -116,7 +116,7 @@ func (suite *ContextSuiteTest) TestSelectSingleSubscriptionIdAndExistingResource
 	suite.mockResourceGroupHeper.On("GetSubscriptionIDs", ctx).Return([]subscription.Model{subModel("123456", "Subscription1")}, nil)
 
 	selectOptions := []string{"create a new resource group", "group1 (eastus)", "group2 (westeurope)"}
-	suite.mockUserSelector.On("userSelect", "Select a resource group", selectOptions).Return(2, nil)
+	suite.mockUserPrompt.On("Select", "Select a resource group", selectOptions).Return(2, nil)
 	suite.mockResourceGroupHeper.On("ListGroups", ctx, "123456").Return([]resources.Group{
 		group("group1", "eastus"),
 		group("group2", "westeurope"),
@@ -138,9 +138,9 @@ func (suite *ContextSuiteTest) TestSelectSubscriptionIdAndExistingResourceGroup(
 	suite.mockResourceGroupHeper.On("GetSubscriptionIDs", ctx).Return([]subscription.Model{sub1, sub2}, nil)
 
 	selectOptions := []string{"Subscription1 (1234)", "Subscription2 (5678)"}
-	suite.mockUserSelector.On("Select", "Select a subscription ID", selectOptions).Return(1, nil)
+	suite.mockUserPrompt.On("Select", "Select a subscription ID", selectOptions).Return(1, nil)
 	selectOptions = []string{"create a new resource group", "group1 (eastus)", "group2 (westeurope)"}
-	suite.mockUserSelector.On("Select", "Select a resource group", selectOptions).Return(2, nil)
+	suite.mockUserPrompt.On("Select", "Select a resource group", selectOptions).Return(2, nil)
 	suite.mockResourceGroupHeper.On("ListGroups", ctx, "5678").Return([]resources.Group{
 		group("group1", "eastus"),
 		group("group2", "westeurope"),
@@ -188,25 +188,25 @@ func TestContextSuite(t *testing.T) {
 	suite.Run(t, new(ContextSuiteTest))
 }
 
-type MockUserSelector struct {
+type mockUserPrompt struct {
 	mock.Mock
 }
 
-func (s *MockUserSelector) Select(message string, options []string) (int, error) {
+func (s *mockUserPrompt) Select(message string, options []string) (int, error) {
 	args := s.Called(message, options)
 	return args.Int(0), args.Error(1)
 }
-func (s *MockUserSelector) Confirm(message string, defaultValue bool) (bool, error) {
+func (s *mockUserPrompt) Confirm(message string, defaultValue bool) (bool, error) {
 	args := s.Called(message, options)
 	return args.Bool(0), args.Error(1)
 }
 
-func (s *MockUserSelector) Input(message string, defaultValue string) (string, error) {
+func (s *mockUserPrompt) Input(message string, defaultValue string) (string, error) {
 	args := s.Called(message, options)
 	return args.String(0), args.Error(1)
 }
 
-func (s *MockUserSelector) Password(message string) (string, error) {
+func (s *mockUserPrompt) Password(message string) (string, error) {
 	args := s.Called(message, options)
 	return args.String(0), args.Error(1)
 }
diff --git a/cli/mobycli/exec_test.go b/cli/mobycli/exec_test.go
index e9d0a1b6f..f9ab85efd 100644
--- a/cli/mobycli/exec_test.go
+++ b/cli/mobycli/exec_test.go
@@ -15,7 +15,7 @@ type MobyExecSuite struct {
 
 func (sut *MobyExecSuite) TestDelegateContextTypeToMoby() {
 	Expect(mustDelegateToMoby("moby")).To(BeTrue())
-	Expect(mustDelegateToMoby("aws")).To(BeTrue())
+	Expect(mustDelegateToMoby("aws")).To(BeFalse())
 	Expect(mustDelegateToMoby("aci")).To(BeFalse())
 }