diff --git a/.gitignore b/.gitignore
index bccdf40..90dfd6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
 # Ignore Vagrant cache files
 /.vagrant/
 
+# Ignore molecule and pytest files
+**__pycache__**
+.molecule
+
 # Ignore retry files
 *.retry
diff --git a/.molecule/ansible.cfg b/.molecule/ansible.cfg
deleted file mode 100644
index 4c598b5..0000000
--- a/.molecule/ansible.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-# Molecule managed
-
-[defaults]
-roles_path = .molecule/roles/:.molecule/../roles/:../:../../
-library = .molecule/library/:library/
-action_plugins = .molecule/plugins/actions/:plugins/actions/
-callback_plugins = .molecule/plugins/callbacks/:plugins/callbacks/
-connection_plugins = .molecule/plugins/connections/:plugins/connections/
-lookup_plugins = .molecule/plugins/lookups/:plugins/lookups/
-vars_plugins = .molecule/plugins/vars/:plugins/vars/
-filter_plugins = .molecule/plugins/filters/:plugins/filters/
-ansible_managed = Ansible managed: Do NOT edit this file manually!
-nocows = 1
-retry_files_enabled = False
-
-[ssh_connection]
diff --git a/.molecule/ansible_inventory b/.molecule/ansible_inventory
deleted file mode 100644
index dc5d291..0000000
--- a/.molecule/ansible_inventory
+++ /dev/null
@@ -1,5 +0,0 @@
-[all]
-xenial ansible_connection=docker
-stretch ansible_connection=docker
-jessie ansible_connection=docker
-centos7 ansible_connection=docker
diff --git a/.molecule/rakefile b/.molecule/rakefile
deleted file mode 100644
index 301d5a0..0000000
--- a/.molecule/rakefile
+++ /dev/null
@@ -1,30 +0,0 @@
-# Molecule managed
-
-require 'rake'
-require 'rspec/core/rake_task'
-require 'yaml'
-require 'fileutils'
-
-task spec: 'serverspec:all'
-task default: :spec
-
-hosts = YAML.load_file('.molecule/state.yml')['hosts']
-
-namespace :serverspec do
-  task all: hosts.keys
-  hosts.each do |name, host|
-    desc "Run serverspec on #{name}"
-    pattern = ['spec/*_spec.rb', "spec/#{name}/*_spec.rb", "spec/hosts/#{name}/*_spec.rb"]
-
-    host['groups'].each do |group|
-      pattern << "spec/#{group}/*_spec.rb"
-      pattern << "spec/groups/#{group}/*_spec.rb"
-    end
-
-    RSpec::Core::RakeTask.new(name.to_sym) do |target|
-      puts "*** Run serverspec on #{name} ***"
-      ENV['TARGET_HOST'] = name
-      target.pattern = pattern.join(',')
-    end
-  end
-end
diff --git a/.molecule/state.yml b/.molecule/state.yml
deleted file mode 100644
index 18a779c..0000000
--- a/.molecule/state.yml
+++ /dev/null
@@ -1,18 +0,0 @@
----
-converged: null
-created: true
-default_platform: null
-default_provider: null
-driver: docker
-driver_config: {}
-hosts:
-  centos7:
-    groups: []
-  jessie:
-    groups: []
-  stretch:
-    groups: []
-  xenial:
-    groups: []
-installed_deps: true
-multiple_platforms: null
diff --git a/handlers/main.yml b/handlers/main.yml
index e1c0207..e2c74b0 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,7 +1,8 @@
 ---
 - name: reload unit
   become: true
-  command: systemctl daemon-reload
+  systemd:
+    daemon_reload: yes
   when:
     - ansible_service_mgr == "systemd"
 
diff --git a/tasks/install.yml b/tasks/install.yml
index 89c6fd3..315f152 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -1,6 +1,7 @@
 ---
 
-- set_fact:
+- name: Compose md5 checksum
+  set_fact:
     setup_script_checksum: "md5:{{ setup_script_md5_sum }}"
   when: setup_script_md5_sum is defined and setup_script_md5_sum
 
@@ -12,4 +13,6 @@
     mode: 0755
 
 - name: Execute docker setup script
-  shell: "/tmp/docker-setup.sh"
\ No newline at end of file
+  shell: "/tmp/docker-setup.sh"
+  tags:
+    - skip_ansible_lint
diff --git a/tests/playbook.yml b/tests/playbook.yml
index 23a7fca..a3d5cdc 100644
--- a/tests/playbook.yml
+++ b/tests/playbook.yml
@@ -7,5 +7,3 @@
     default_docker_config:
       storage-driver: vfs
       log-level: info
-
-
diff --git a/tests/test_default.py b/tests/test_default.py
index cae0c54..5e6a256 100644
--- a/tests/test_default.py
+++ b/tests/test_default.py
@@ -52,4 +52,3 @@ def test_packages(host):
         DOCKER = 'docker-ce'
 
     assert host.package(DOCKER).is_installed
-