diff --git a/src/CLU/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs b/src/CLU/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs
index fb35d2ee297c..d8641135ca63 100644
--- a/src/CLU/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs
+++ b/src/CLU/Commands.Common.Authentication/Authentication/AdalTokenProvider.cs
@@ -14,7 +14,7 @@
 
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using System;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
diff --git a/src/CLU/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs b/src/CLU/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs
index da3531888f4f..e8576f653a81 100644
--- a/src/CLU/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs
+++ b/src/CLU/Commands.Common.Authentication/Authentication/ServicePrincipalTokenProvider.cs
@@ -16,7 +16,7 @@
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest;
 using System;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
diff --git a/src/CLU/Commands.Common.Authentication/Authentication/UserTokenProvider.cs b/src/CLU/Commands.Common.Authentication/Authentication/UserTokenProvider.cs
index df96ae6be080..c410c5678ed5 100644
--- a/src/CLU/Commands.Common.Authentication/Authentication/UserTokenProvider.cs
+++ b/src/CLU/Commands.Common.Authentication/Authentication/UserTokenProvider.cs
@@ -19,7 +19,7 @@
 using System.Runtime.InteropServices;
 using Microsoft.Rest.Azure.Authentication;
 using System.Management.Automation;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
diff --git a/src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs b/src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs
index 2b64a806abd9..82582ce93143 100644
--- a/src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs
+++ b/src/CLU/Commands.Common.Authentication/AuthenticationFactory.cs
@@ -19,7 +19,7 @@
 using Microsoft.IdentityModel.Clients.ActiveDirectory;
 using Microsoft.Rest;
 using Microsoft.Rest.Azure.Authentication;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Factories
 {
diff --git a/src/CLU/Commands.Common.Authentication/ClientFactory.cs b/src/CLU/Commands.Common.Authentication/ClientFactory.cs
index 1efa06614215..d83e56e2e466 100644
--- a/src/CLU/Commands.Common.Authentication/ClientFactory.cs
+++ b/src/CLU/Commands.Common.Authentication/ClientFactory.cs
@@ -22,7 +22,7 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Reflection;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Factories
 {
diff --git a/src/CLU/Commands.Common.Authentication/Commands.Common.Authentication.xproj b/src/CLU/Commands.Common.Authentication/Commands.Common.Authentication.xproj
index 34636cbdd139..1a316f7ab068 100644
--- a/src/CLU/Commands.Common.Authentication/Commands.Common.Authentication.xproj
+++ b/src/CLU/Commands.Common.Authentication/Commands.Common.Authentication.xproj
@@ -7,7 +7,7 @@
   <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>4ce82310-d016-497d-93a0-0323a3e62064</ProjectGuid>
-    <RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
+    <RootNamespace>Commands.Common.Authentication</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">..\artifacts\bin\$(MSBuildProjectName)\</OutputPath>
   </PropertyGroup>
diff --git a/src/CLU/Commands.Common.Authentication/JsonUtilities.cs b/src/CLU/Commands.Common.Authentication/JsonUtilities.cs
index db742c8023e2..8804102bb551 100644
--- a/src/CLU/Commands.Common.Authentication/JsonUtilities.cs
+++ b/src/CLU/Commands.Common.Authentication/JsonUtilities.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
diff --git a/src/CLU/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs b/src/CLU/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs
index f38d3825a396..7f3fe2d3f250 100644
--- a/src/CLU/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs
+++ b/src/CLU/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs
@@ -14,7 +14,7 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {
diff --git a/src/CLU/Commands.Common.Authentication/Models/AzureSMProfile.cs b/src/CLU/Commands.Common.Authentication/Models/AzureSMProfile.cs
index 9dd199acdf58..45ad834fc49b 100644
--- a/src/CLU/Commands.Common.Authentication/Models/AzureSMProfile.cs
+++ b/src/CLU/Commands.Common.Authentication/Models/AzureSMProfile.cs
@@ -17,7 +17,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {
diff --git a/src/CLU/Commands.Common.Authentication/Models/DiskDataStore.cs b/src/CLU/Commands.Common.Authentication/Models/DiskDataStore.cs
index a9e2d910b725..af11eab542a5 100644
--- a/src/CLU/Commands.Common.Authentication/Models/DiskDataStore.cs
+++ b/src/CLU/Commands.Common.Authentication/Models/DiskDataStore.cs
@@ -16,7 +16,7 @@
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication.Models
 {
diff --git a/src/CLU/Commands.Common.Authentication/Properties/Resources.Designer.cs b/src/CLU/Commands.Common.Authentication/Properties/Resources.Designer.cs
index 5b886e3c1bd2..3102187a590a 100644
--- a/src/CLU/Commands.Common.Authentication/Properties/Resources.Designer.cs
+++ b/src/CLU/Commands.Common.Authentication/Properties/Resources.Designer.cs
@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Microsoft.Azure.Commands.Common.Authentication.Properties {
+namespace Commands.Common.Authentication.Properties {
     using System;
     using System.Reflection;
     
@@ -38,7 +38,7 @@ internal Resources() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.Azure.Commands.Common.Authentication.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Commands.Common.Authentication.Properties.Resources", typeof(Resources).GetTypeInfo().Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -150,7 +150,7 @@ internal static string CertificateNotFoundInStore {
         }
         
         /// <summary>
-        ///    Looks up a localized string similar to Changing public environment is not supported..
+        ///    Looks up a localized string similar to Changing a public environment is not supported..
         /// </summary>
         internal static string ChangingDefaultEnvironmentNotSupported {
             get {
diff --git a/src/CLU/Commands.Common.Authentication/Properties/Resources.resx b/src/CLU/Commands.Common.Authentication/Properties/Resources.resx
index f77ecda5264e..3e75cad26709 100644
--- a/src/CLU/Commands.Common.Authentication/Properties/Resources.resx
+++ b/src/CLU/Commands.Common.Authentication/Properties/Resources.resx
@@ -124,7 +124,7 @@
     <value>No certificate was found in the certificate store with thumbprint {0}</value>
   </data>
   <data name="ChangingDefaultEnvironmentNotSupported" xml:space="preserve">
-    <value>Changing public environment is not supported.</value>
+    <value>Changing a public environment is not supported.</value>
   </data>
   <data name="CredentialOrganizationIdMessage" xml:space="preserve">
     <value>-Credential parameter can only be used with Organization ID credentials. For more information, please refer to http://go.microsoft.com/fwlink/?linkid=331007&amp;clcid=0x409 for more information about the difference between an organizational account and a Microsoft account.</value>
diff --git a/src/CLU/Commands.Common.Authentication/Validate.cs b/src/CLU/Commands.Common.Authentication/Validate.cs
index ab06f60a3f6e..e25efbaeb580 100644
--- a/src/CLU/Commands.Common.Authentication/Validate.cs
+++ b/src/CLU/Commands.Common.Authentication/Validate.cs
@@ -15,7 +15,7 @@
 using System;
 using System.IO;
 using System.Linq;
-using Microsoft.Azure.Commands.Common.Authentication.Properties;
+using Commands.Common.Authentication.Properties;
 
 namespace Microsoft.Azure.Commands.Common.Authentication
 {
diff --git a/src/CLU/Microsoft.ScenarioTests.CLU/EntryStub.cs b/src/CLU/Microsoft.ScenarioTests.CLU/EntryStub.cs
new file mode 100644
index 000000000000..2f1fbee8d2d2
--- /dev/null
+++ b/src/CLU/Microsoft.ScenarioTests.CLU/EntryStub.cs
@@ -0,0 +1,29 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.Azure.Commands
+{
+    public class EntryStub
+    {
+        public static void Main(string[] args)
+        {
+            // empty entry point
+        }
+    }
+}
diff --git a/src/CLU/Microsoft.ScenarioTests.CLU/project.json b/src/CLU/Microsoft.ScenarioTests.CLU/project.json
index ae8d95805f33..8a8dd5f0cb9b 100644
--- a/src/CLU/Microsoft.ScenarioTests.CLU/project.json
+++ b/src/CLU/Microsoft.ScenarioTests.CLU/project.json
@@ -16,5 +16,6 @@
   },
   "dependencies": {
     "Microsoft.CLU": ""
-  }
+  },
+  "compilationOptions": { "emitEntryPoint": true }
 }