diff --git a/Modules/VMware.vSphere.SsoAdmin/README.md b/Modules/VMware.vSphere.SsoAdmin/README.md
index 92a09ff..4c830fd 100644
--- a/Modules/VMware.vSphere.SsoAdmin/README.md
+++ b/Modules/VMware.vSphere.SsoAdmin/README.md
@@ -13,18 +13,18 @@ This module depends on PowerCLI 'VMware.VimAutomation.Common', Version 12.0 modu
 This directory contains the .NET binaries sources code and Pester integration tests that cover both the binaries and the module advanced functions functionality.<br/>
 
 ## Required build tools
-- PowerShell 7.0
-- dotnet sdk<br>
+- PowerShell 7.0<br/>
+- dotnet sdk<br/>
 
 ## Required test tools 
 - PowerShell 7.0
-- PowerCLI 12.0<br>
-- Pester 4.8.1<br>
+- PowerCLI 12.0<br/>
+- Pester 4.8.1<br/>
 
 ## '/src/build.ps1' script
 The script builds the binaries and publishes them to the 'net45' and 'netcoreapp2.0' directories of the module.<br/>
 
-It has also the option to run module Pester tests. The optional parameters for VC server and credentials has to be specified in order the script to run the tests. Tests run in separate PowreShell process because PowerShell has to load the load the module binaries which are build output.<br/>
+It has also the option to run module Pester tests. The optional parameters for VC server and credentials has to be specified in order the script to run the tests. Tests run in separate PowreShell process because PowerShell has to load the module binaries which are build output.<br/>
 
 ## '/src/test/RunTests.ps1' script
 This script can be used to run the tests<br/>
\ No newline at end of file
diff --git a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1 b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
index e278fdb..fb86ba2 100644
--- a/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
+++ b/Modules/VMware.vSphere.SsoAdmin/VMware.vSphere.SsoAdmin.psm1
@@ -1,3 +1,7 @@
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
+
 #
 # Script module for module 'VMware.vSphere.SsoAdmin'
 #
diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.LsClient.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.LsClient.dll
index 3f70d11..908b2f2 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.LsClient.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.LsClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll
index 7a3e7b6..831ca20 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdmin.Utils.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll
index 1f0f287..a578aab 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll and b/Modules/VMware.vSphere.SsoAdmin/net45/VMware.vSphere.SsoAdminClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.LsClient.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.LsClient.dll
index e457b31..2662163 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.LsClient.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.LsClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll
index 901a8f6..8309b2b 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdmin.Utils.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll
index 7f8dcbf..eef1a7d 100644
Binary files a/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll and b/Modules/VMware.vSphere.SsoAdmin/netcoreapp2.0/VMware.vSphere.SsoAdminClient.dll differ
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.LsClient/LookupServiceClient.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.LsClient/LookupServiceClient.cs
index b9d8a7f..542926f 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.LsClient/LookupServiceClient.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.LsClient/LookupServiceClient.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 using System;
 using System.Collections;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/AcceptAllX509CertificateValidator.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/AcceptAllX509CertificateValidator.cs
index 3b161d5..83a2b4b 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/AcceptAllX509CertificateValidator.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdmin.Utils/AcceptAllX509CertificateValidator.cs
@@ -1,4 +1,8 @@
-using System;
+// **************************************************************************
+//  Copyright 2020 VMware, Inc.
+// **************************************************************************
+
+using System;
 using System.IdentityModel.Selectors;
 using System.Security.Cryptography.X509Certificates;
 
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs
index 1e9f639..625bfa4 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient.Tests/IntegrationTests.cs
@@ -1,3 +1,6 @@
+// **************************************************************************
+//  Copyright 2020 VMware, Inc.
+// **************************************************************************
 using NUnit.Framework;
 using System.Linq;
 using System.Security;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/Group.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/Group.cs
index cb561c0..c0edc38 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/Group.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/Group.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 using System;
 using System.Collections.Generic;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/LockoutPolicy.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/LockoutPolicy.cs
index d73da47..0dc22b6 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/LockoutPolicy.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/LockoutPolicy.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 
 using System;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PasswordPolicy.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PasswordPolicy.cs
index 215d22d..e5e3132 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PasswordPolicy.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PasswordPolicy.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 
 using System;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PersonUser.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PersonUser.cs
index a17394a..9d0e388 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PersonUser.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/PersonUser.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 using System;
 using System.Collections.Generic;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/SsoAdminServer.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/SsoAdminServer.cs
index fe43a78..086dd4f 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/SsoAdminServer.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/SsoAdminServer.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 
 using System;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/TokenLifetime.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/TokenLifetime.cs
index c5d7cf0..f572c74 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/TokenLifetime.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/DataTypes/TokenLifetime.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 
 using System;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
index ec44174..dc82105 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/SsoAdminClient.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 
 using System;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/UserPassSecurityContext.cs b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/UserPassSecurityContext.cs
index 6860a8c..6e5bce4 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/UserPassSecurityContext.cs
+++ b/Modules/VMware.vSphere.SsoAdmin/src/VMware.vSphere.SsoAdmin.Client/VMware.vSphere.SsoAdminClient/UserPassSecurityContext.cs
@@ -1,5 +1,5 @@
 // **************************************************************************
-//  Copyright (c) VMware, Inc.  All rights reserved. -- VMware Confidential.
+//  Copyright 2020 VMware, Inc.
 // **************************************************************************
 using System;
 using System.Collections.Generic;
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/build.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
index fe1bd40..5b796bc 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/build.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
    [ValidateSet("Debug", "Release")]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
index ce643a2..fee3610 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/ConnectDisconnect.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/Group.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/Group.Tests.ps1
index 2da9d37..4b9a0b9 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/Group.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/Group.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/LockoutPolicy.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/LockoutPolicy.Tests.ps1
index c889602..198dba8 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/LockoutPolicy.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/LockoutPolicy.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/LsClient.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/LsClient.Tests.ps1
index 8ed5956..05d2fff 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/LsClient.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/LsClient.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/PasswordPolicy.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/PasswordPolicy.Tests.ps1
index 36c3680..7eb8fca 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/PasswordPolicy.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/PasswordPolicy.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/PersonUser.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/PersonUser.Tests.ps1
index 2db78df..4b959dc 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/PersonUser.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/PersonUser.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/RunTests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/RunTests.ps1
index ebbbdfd..a6bff25 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/RunTests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/RunTests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]
@@ -25,8 +25,6 @@ function Test-PesterIsAvailable() {
 
 Test-PesterIsAvailable
 
-$testFiles = Get-ChildItem -Path $PSScriptRoot -Filter "*.Tests.ps1"
-
 Invoke-Pester `
    -Script @{
        Path = $PSScriptRoot
diff --git a/Modules/VMware.vSphere.SsoAdmin/src/test/TokenLifetime.Tests.ps1 b/Modules/VMware.vSphere.SsoAdmin/src/test/TokenLifetime.Tests.ps1
index 89f42a4..c83c96f 100644
--- a/Modules/VMware.vSphere.SsoAdmin/src/test/TokenLifetime.Tests.ps1
+++ b/Modules/VMware.vSphere.SsoAdmin/src/test/TokenLifetime.Tests.ps1
@@ -1,6 +1,6 @@
-#**************************************************************************
-# Copyright (c) VMware, Inc. All rights reserved.
-#**************************************************************************
+# **************************************************************************
+#  Copyright 2020 VMware, Inc.
+# **************************************************************************
 
 param(
     [Parameter(Mandatory = $true)]