diff --git a/defaults/main.yml b/defaults/main.yml
index ec6d83d..485503c 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -4,6 +4,8 @@
 telegraf_agent_version: 1.10.0
 telegraf_agent_version_patch: 1
 telegraf_agent_package: telegraf
+telegraf_agent_package_file_deb: telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
+telegraf_agent_package_file_rpm: telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm
 telegraf_agent_package_path: /tmp
 telegraf_agent_package_method: repo
 telegraf_agent_package_state: present
diff --git a/molecule/default/tests/test_default.py b/molecule/default/tests/test_default.py
index 507d6c3..aeab598 100644
--- a/molecule/default/tests/test_default.py
+++ b/molecule/default/tests/test_default.py
@@ -6,15 +6,15 @@
     os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('telegraf')
 
 
-def test_telegraf_running_and_enabled(Service, SystemInfo):
-    telegraf = Service("telegraf")
-    if SystemInfo.distribution not in ['opensuse-leap']:
+def test_telegraf_running_and_enabled(host):
+    telegraf = host.service("telegraf")
+    if host.system_info.distribution not in ['opensuse-leap']:
         assert telegraf.is_enabled
         assert telegraf.is_running
 
 
-def test_telegraf_dot_conf(File):
-    telegraf = File("/etc/telegraf/telegraf.conf")
+def test_telegraf_dot_conf(host):
+    telegraf = host.file("/etc/telegraf/telegraf.conf")
     assert telegraf.user == "telegraf"
     assert telegraf.group == "telegraf"
     assert telegraf.mode == 0o640
@@ -26,16 +26,16 @@ def test_telegraf_dot_conf(File):
     assert telegraf.contains('[[inputs.net]]')
 
 
-def test_telegraf_dot_d_dir(File):
-    telegraf = File("/etc/telegraf/telegraf.d")
+def test_telegraf_dot_d_dir(host):
+    telegraf = host.file("/etc/telegraf/telegraf.d")
     assert telegraf.user == "root"
     assert telegraf.group == "root"
     assert telegraf.mode == 0o755
     assert telegraf.is_directory
 
 
-def test_telegraf_dot_d(File):
-    telegraf = File("/etc/telegraf/telegraf.d/percpu-usage.conf")
+def test_telegraf_dot_d(host):
+    telegraf = host.file("/etc/telegraf/telegraf.d/percpu-usage.conf")
     assert telegraf.user == "telegraf"
     assert telegraf.group == "telegraf"
     assert telegraf.mode == 0o640
@@ -43,6 +43,6 @@ def test_telegraf_dot_d(File):
     assert telegraf.contains('totalcpu = false')
 
 
-def test_telegraf_package(Package):
-    telegraf = Package('telegraf')
+def test_telegraf_package(host):
+    telegraf = host.package('telegraf')
     assert telegraf.is_installed
diff --git a/molecule/default/tests/test_default.pyc b/molecule/default/tests/test_default.pyc
deleted file mode 100644
index 4864f17..0000000
Binary files a/molecule/default/tests/test_default.pyc and /dev/null differ
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 096a8e8..7b26d01 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -65,7 +65,7 @@
 
 - name: "Debian | Download Telegraf package (online)"
   get_url:
-    url: https://dl.influxdata.com/telegraf/releases/telegraf_{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}_{{ telegraf_agent_package_arch }}.deb
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_deb }}
     dest: "{{ telegraf_agent_package }}"
   when:
     - telegraf_agent_package_method == "online"
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 137e35b..498bfc2 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -10,7 +10,8 @@
 - name: Use RHEL 7 packages for Fedora
   set_fact:
     telegraf_redhat_releasever: 7
-  when: ansible_distribution == "Fedora"
+  when:
+    - ansible_distribution == "Fedora"
 
 - name: "RedHat | Add yum repository"
   yum_repository:
@@ -24,7 +25,7 @@
 
 - name: "RedHat | Download Telegraf package (online)"
   get_url:
-    url: https://dl.influxdata.com/telegraf/releases/telegraf-{{ telegraf_agent_version }}-{{ telegraf_agent_version_patch }}.{{ ansible_architecture }}.rpm
+    url: https://dl.influxdata.com/telegraf/releases/{{ telegraf_agent_package_file_rpm }}
     dest: "{{ telegraf_agent_package }}"
   when:
     - telegraf_agent_package_method == "online"