diff --git a/roles/aws_common/.yamllint b/roles/aws_common/.yamllint
index ad0be76..a87f8ff 100644
--- a/roles/aws_common/.yamllint
+++ b/roles/aws_common/.yamllint
@@ -9,3 +9,4 @@ rules:
     level: error
   line-length: disable
   truthy: disable
+  trailing-spaces: false
diff --git a/roles/aws_common/molecule/default/playbook.yml b/roles/aws_common/molecule/default/playbook.yml
index 840ddee..9eef35b 100644
--- a/roles/aws_common/molecule/default/playbook.yml
+++ b/roles/aws_common/molecule/default/playbook.yml
@@ -1,5 +1,7 @@
 ---
 - name: Converge
   hosts: all
+  vars:
+    ansible_ec2_instance_id: "NONE"
   roles:
     - role: aws_common
diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml
index fa0b19b..75815a8 100644
--- a/roles/aws_common/tasks/main.yml
+++ b/roles/aws_common/tasks/main.yml
@@ -11,4 +11,3 @@
 - name: Use EC2 instance ID for cluster node ID
   set_fact:
     atl_cluster_node_id: "{{ ansible_ec2_instance_id }}"
-
diff --git a/roles/product_common/molecule/default/playbook.yml b/roles/product_common/molecule/default/playbook.yml
index a3dbc4d..b0dc0f9 100644
--- a/roles/product_common/molecule/default/playbook.yml
+++ b/roles/product_common/molecule/default/playbook.yml
@@ -4,8 +4,10 @@
   vars:
     atl_product_user: "testuser"
     atl_product_home: "/opt/atlassian/product"
+    atl_product_installation_base: "/opt/atlassian/product/install"
     atl_installer_temp: "/opt/atlassian/temp"
     atl_product_home_shared: "/media/atl/jira/shared"
+    atl_product_shared_plugins: "/media/atl/jira/shared/plugins/"
   roles:
     - role: linux_common
     - role: product_common
diff --git a/roles/product_download/molecule/bitbucket_latest/tests/test_default.py b/roles/product_download/molecule/bitbucket_latest/tests/test_default.py
index 0e8039a..164b088 100644
--- a/roles/product_download/molecule/bitbucket_latest/tests/test_default.py
+++ b/roles/product_download/molecule/bitbucket_latest/tests/test_default.py
@@ -8,33 +8,33 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
 
 def test_version_downloaded(host):
-    verfile = host.file('/media/atl/confluence/shared/confluence.version')
+    verfile = host.file('/media/atl/stash/shared/bitbucket.version')
     assert verfile.exists
 
 def test_symlink_created(host):
-    target = host.file('/opt/atlassian/confluence/current')
+    target = host.file('/opt/atlassian/bitbucket/current')
     assert target.exists
     assert target.is_symlink
 
 def test_unpacked(host):
-    verfile = host.file('/opt/atlassian/confluence/current/bin/catalina.sh')
+    verfile = host.file('/opt/atlassian/bitbucket/current/bin/start-bitbucket.sh')
     assert verfile.exists
 
 def test_version_file_is_latest(host):
-    verfile = host.file('/media/atl/confluence/shared/confluence.version')
+    verfile = host.file('/media/atl/stash/shared/bitbucket.version')
     assert verfile.exists
 
-    upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/confluence/versions/latest")
+    upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/bitbucket/versions/latest")
     upstream_json = json.load(upstream_fd)
     upstream = upstream_json['version']
 
     assert verfile.content.decode("UTF-8").strip() == upstream.strip()
 
 def test_latest_is_downloaded(host):
-    upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/confluence/versions/latest")
+    upstream_fd = urllib.request.urlopen("https://marketplace.atlassian.com/rest/2/applications/bitbucket/versions/latest")
     upstream_json = json.load(upstream_fd)
     upstream = upstream_json['version']
 
-    installer = host.file('/opt/atlassian/tmp/confluence.'+upstream+'.tar.gz')
+    installer = host.file('/opt/atlassian/tmp/bitbucket.'+upstream+'.tar.gz')
     assert installer.exists
     assert installer.user == 'root'