diff --git a/plugins/module_utils/azure_rm_common.py b/plugins/module_utils/azure_rm_common.py
index 184f7fbb4..95a823a4a 100644
--- a/plugins/module_utils/azure_rm_common.py
+++ b/plugins/module_utils/azure_rm_common.py
@@ -1312,6 +1312,7 @@ def search_client(self):
                                                            api_version='2020-08-01')
         return self._search_client
 
+    @property
     def datalake_store_client(self):
         self.log('Getting datalake store client...')
         if not self._datalake_store_client:
@@ -1320,6 +1321,7 @@ def datalake_store_client(self):
                                                                    api_version='2016-11-01')
         return self._datalake_store_client
 
+    @property
     def datalake_store_models(self):
         return DataLakeStoreAccountModel
 
diff --git a/tests/integration/targets/azure_rm_cognitivesearch/aliases b/tests/integration/targets/azure_rm_cognitivesearch/aliases
index aa77c071a..5d29c6c4d 100644
--- a/tests/integration/targets/azure_rm_cognitivesearch/aliases
+++ b/tests/integration/targets/azure_rm_cognitivesearch/aliases
@@ -1,3 +1,3 @@
 cloud/azure
-shippable/azure/group2
+shippable/azure/group10
 destructive
diff --git a/tests/integration/targets/azure_rm_storageaccount/tasks/main.yml b/tests/integration/targets/azure_rm_storageaccount/tasks/main.yml
index affb3dd20..6cbe42e30 100644
--- a/tests/integration/targets/azure_rm_storageaccount/tasks/main.yml
+++ b/tests/integration/targets/azure_rm_storageaccount/tasks/main.yml
@@ -1,15 +1,15 @@
 - name: Set Storage Account Names
   set_fact:
-    storage_account_name_default: "sa{{ resource_group | hash('md5') | truncate(22, True, '') }}"
-    storage_account_name_explicit: "sa{{ resource_group | hash('sha1') | truncate(22, True, '') }}"
+    storage_account_name_default: "sa{{ resource_group | hash('md5') | truncate(20, True, '') }}"
+    storage_account_name_explicit: "sa{{ resource_group | hash('sha1') | truncate(20, True, '') }}"
 
 - name: Test invalid account name
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "invalid_char$"
     account_type: Standard_LRS
   register: output
-  ignore_errors: yes  
+  ignore_errors: yes
 
 - name: Check intentional name failure.
   assert: 
@@ -19,17 +19,18 @@
 
 - name: Delete storage accounts to prepare fresh deployment
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ item }}"
     state: absent
     force_delete_nonempty: True
   loop:
     - "{{ storage_account_name_default }}"
     - "{{ storage_account_name_explicit }}"
+    - "{{ storage_account_name_default }}02"
 
 - name: Create new storage account with defaults (omitted parameters)
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ storage_account_name_default }}"
     account_type: Standard_LRS
   register: defaults_output
@@ -45,6 +46,20 @@
       - defaults_output.state.allow_blob_public_access == None
       - defaults_output.state.minimum_tls_version == None
 
+- name: Create new storage account with I(kind=FileStorage)
+  azure_rm_storageaccount:
+    resource_group: "{{ resource_group }}"
+    name: "{{ storage_account_name_default }}02"
+    account_type: Premium_ZRS
+    kind: FileStorage
+  register: filestorage_output
+
+- name: Assert status succeeded and results match I(kind=FileStorage)
+  assert:
+    that:
+      - filestorage_output.changed
+      - filestorage_output.state.sku_name == "Premium_ZRS"
+
 - name: Create new storage account with explicit parameters
   azure_rm_storageaccount:
     access_tier: Hot
@@ -75,7 +90,7 @@
       ip_rules:
         - value: '9.9.9.9'
           action: Allow
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     tags:
       test: test
       galaxy: galaxy
@@ -124,7 +139,7 @@
       ip_rules:
         - value: '9.9.9.9'
           action: Allow
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     tags:
       test: test
       galaxy: galaxy
@@ -154,7 +169,7 @@
 
 - name: Update existing storage account with parameters omitted
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ storage_account_name_explicit }}"
   register: output
 
@@ -182,7 +197,7 @@
 
 - name: Update existing storage account with parameters defined
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ storage_account_name_default }}"
     allow_blob_public_access: False
     append_tags: no
@@ -230,13 +245,13 @@
 
 - name: Change existing account type (invalid)
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ storage_account_name_default }}"
     account_type: Premium_LRS
   register: output
-  ignore_errors: yes 
+  ignore_errors: yes
 
-- name: Assert account type change failed 
+- name: Assert account type change failed
   assert:
     that:
       - output.failed
@@ -244,7 +259,7 @@
 
 - name: Unverified custom domain failure
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ storage_account_name_default }}"
     custom_domain:
       name: ansible.com
@@ -300,7 +315,7 @@
       - output.storageaccounts[0].account_type == "Premium_LRS"
       - output.storageaccounts[0].primary_endpoints.blob.connectionstring
       - output.storageaccounts[0].blob_cors
-      - output.storageaccounts[0].minimum_tls_version == "TLS1_2" 
+      - output.storageaccounts[0].minimum_tls_version == "TLS1_2"
       - not output.storageaccounts[0].allow_blob_public_access
       - not output.storageaccounts[0].https_only
       - output.storageaccounts[0].network_acls.bypass == "AzureServices"
@@ -318,10 +333,11 @@
 
 - name: Delete storage accounts
   azure_rm_storageaccount:
-    resource_group: "{{ resource_group }}" 
+    resource_group: "{{ resource_group }}"
     name: "{{ item }}"
     state: absent
     force_delete_nonempty: True
   loop:
     - "{{ storage_account_name_default }}"
+    - "{{ storage_account_name_default }}02"
     - "{{ storage_account_name_explicit }}"