Skip to content

SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.

Move SpiderFootTarget into spiderfoot module

Brendan Colesde1315d27821
diff --git a/setup.cfg b/setup.cfg
index 13236781..bcd68cec 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,5 @@
[flake8]
flake8-max-line-length = 120
ignore = F841 E501 W503 E131 E401 E201 E302 E265 W605 W504 E226 E722 E741 E502
+per-file-ignores =
+ spiderfoot/__init__.py:F401
diff --git a/sflib.py b/sflib.py
index 195d8c7f..a5382743 100644
--- a/sflib.py
+++ b/sflib.py
@@ -43,6 +43,7 @@ from networkx.readwrite.gexf import GEXFWriter
from publicsuffixlist import PublicSuffixList
from stem import Signal
from stem.control import Controller
+from spiderfoot import SpiderFootTarget
# For hiding the SSL warnings coming from the requests lib
urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
@@ -3107,222 +3108,6 @@ class SpiderFootPlugin():
return None
-class SpiderFootTarget():
- """SpiderFoot target.
-
- Attributes:
- validTypes (list): valid event types accepted as a target
- targetType (str): target type
- targetValue (str): target value
- targetAliases (list): target aliases
- """
-
- _validTypes = ["IP_ADDRESS", 'IPV6_ADDRESS', "NETBLOCK_OWNER", "INTERNET_NAME",
- "EMAILADDR", "HUMAN_NAME", "BGP_AS_OWNER", 'PHONE_NUMBER', "USERNAME"]
- _targetType = None
- _targetValue = None
- _targetAliases = list()
-
- def __init__(self, targetValue, typeName):
- """Initialize SpiderFoot target.
-
- Args:
- targetValue (str): target value
- typeName (str): target type
-
- Raises:
- TypeError: targetValue type was invalid
- ValueError: targetValue value was empty
- ValueError: typeName value was an invalid target type
- """
-
- self.targetType = typeName
- self.targetValue = targetValue
- self.targetAliases = list()
-
- @property
- def targetType(self):
- return self._targetType
-
- @targetType.setter
- def targetType(self, targetType):
- if not isinstance(targetType, str):
- raise TypeError(f"targetType is {type(targetType)}; expected str()")
-
- if targetType not in self._validTypes:
- raise ValueError(f"targetType value is {targetType}; expected {self._validTypes}")
-
- self._targetType = targetType
-
- @property
- def targetValue(self):
- return self._targetValue
-
- @targetValue.setter
- def targetValue(self, targetValue):
- if not isinstance(targetValue, str):
- raise TypeError(f"targetValue is {type(targetValue)}; expected str()")
- if not targetValue:
- raise ValueError("targetValue value is blank")
-
- self._targetValue = targetValue
-
- @property
- def targetAliases(self):
- return self._targetAliases
-
- @targetAliases.setter
- def targetAliases(self, value):
- self._targetAliases = value
-
- def setAlias(self, value, typeName):
- """Specify other hostnames, IPs, etc. that are aliases for this target.
-
- For instance, if the user searched for an ASN, a module
- might supply all the nested subnets as aliases.
- Or, if a user searched for an IP address, a module
- might supply the hostname as an alias.
-
- Args:
- value (str): TBD
- typeName (str): TBD
-
- Returns:
- None
- """
- if not isinstance(value, (str, bytes)):
- return None
-
- if not value:
- return None
-
- if not isinstance(typeName, (str, bytes)):
- return None
-
- if {'type': typeName, 'value': value} in self.targetAliases:
- return None
-
- self.targetAliases.append(
- {'type': typeName, 'value': value.lower()}
- )
-
- return None
-
- def _getEquivalents(self, typeName):
- """TBD
-
- Returns:
- list: target aliases
- """
-
- ret = list()
- for item in self.targetAliases:
- if item['type'] == typeName:
- ret.append(item['value'].lower())
- return ret
-
- def getNames(self):
- """Get all domains associated with the target.
-
- Returns:
- list: domains associated with the target
- """
-
- e = self._getEquivalents("INTERNET_NAME")
- if self.targetType in ["INTERNET_NAME", "EMAILADDR"] and self.targetValue.lower() not in e:
- e.append(self.targetValue.lower())
-
- names = list()
- for name in e:
- if isinstance(name, bytes):
- names.append(name.decode("utf-8"))
- else:
- names.append(name)
-
- return names
-
- def getAddresses(self):
- """Get all IP Subnets or IP Addresses associated with the target.
-
- Returns:
- list: TBD
- """
-
- e = self._getEquivalents("IP_ADDRESS")
- if self.targetType == "IP_ADDRESS":
- e.append(self.targetValue)
-
- e = self._getEquivalents("IPV6_ADDRESS")
- if self.targetType == "IPV6_ADDRESS":
- e.append(self.targetValue)
-
- return e
-
- def matches(self, value, includeParents=False, includeChildren=True):
- """Check whether the supplied value is "tightly" related
- to the original target.
-
- Tightly in this case means:
- 1. If the value is an IP:
- 1.1 is it in the list of aliases or the target itself?
- 1.2 is it on the target's subnet?
- 2. If the value is a name (subdomain, domain, hostname):
- 2.1 is it in the list of aliases or the target itself?
- 2.2 is it a parent of the aliases of the target (domain/subdomain)
- 2.3 is it a child of the aliases of the target (hostname)
-
- Args:
- value (str): can be an Internet Name (hostname, subnet, domain) or an IP address.
- includeParents (bool): True means you consider a value that is
- a parent domain of the target to still be a tight relation.
- includeChildren (bool): False means you don't consider a value
- that is a child of the target to be a tight relation.
-
- Returns:
- bool: whether the value matches the target
- """
- if not isinstance(value, str) and not isinstance(value, bytes):
- return False
-
- value = value.lower()
-
- if isinstance(value, bytes):
- value = value.decode("utf-8")
-
- if not value:
- return False
-
- # We can't really say anything about names, username or phone numbers,
- # so everything matches
- if self.targetType in ["HUMAN_NAME", "PHONE_NUMBER", "USERNAME"]:
- return True
-
- if netaddr.valid_ipv4(value):
- # 1.1
- if value in self.getAddresses():
- return True
- # 1.2
- if self.targetType == "NETBLOCK_OWNER":
- if netaddr.IPAddress(value) in netaddr.IPNetwork(self.targetValue):
- return True
- if self.targetType in ["IP_ADDRESS", "IPV6_ADDRESS"]:
- if netaddr.IPAddress(value) in netaddr.IPNetwork(netaddr.IPAddress(self.targetValue)):
- return True
- else:
- for name in self.getNames():
- # 2.1
- if value == name:
- return True
- # 2.2
- if includeParents and name.endswith("." + value):
- return True
- # 2.3
- if includeChildren and value.endswith("." + name):
- return True
-
- return None
-
-
class SpiderFootEvent():
"""SpiderFootEvent object representing identified data and associated meta data.
diff --git a/sfscan.py b/sfscan.py
index af29d67a..4031437a 100644
--- a/sfscan.py
+++ b/sfscan.py
@@ -18,8 +18,8 @@ from copy import deepcopy
import dns.resolver
from sfdb import SpiderFootDb
-from sflib import (SpiderFoot, SpiderFootEvent, SpiderFootPlugin,
- SpiderFootTarget)
+from sflib import (SpiderFoot, SpiderFootEvent, SpiderFootPlugin)
+from spiderfoot import SpiderFootTarget
class SpiderFootScanner():
diff --git a/spiderfoot/__init__.py b/spiderfoot/__init__.py
new file mode 100644
index 00000000..97639da8
--- /dev/null
+++ b/spiderfoot/__init__.py
@@ -0,0 +1 @@
+from .target import SpiderFootTarget
diff --git a/spiderfoot/target.py b/spiderfoot/target.py
new file mode 100644
index 00000000..9f9384cb
--- /dev/null
+++ b/spiderfoot/target.py
@@ -0,0 +1,218 @@
+import netaddr
+
+class SpiderFootTarget():
+ """SpiderFoot target.
+
+ Attributes:
+ validTypes (list): valid event types accepted as a target
+ targetType (str): target type
+ targetValue (str): target value
+ targetAliases (list): target aliases
+ """
+
+ _validTypes = ["IP_ADDRESS", 'IPV6_ADDRESS', "NETBLOCK_OWNER", "INTERNET_NAME",
+ "EMAILADDR", "HUMAN_NAME", "BGP_AS_OWNER", 'PHONE_NUMBER', "USERNAME"]
+ _targetType = None
+ _targetValue = None
+ _targetAliases = list()
+
+ def __init__(self, targetValue, typeName):
+ """Initialize SpiderFoot target.
+
+ Args:
+ targetValue (str): target value
+ typeName (str): target type
+
+ Raises:
+ TypeError: targetValue type was invalid
+ ValueError: targetValue value was empty
+ ValueError: typeName value was an invalid target type
+ """
+
+ self.targetType = typeName
+ self.targetValue = targetValue
+ self.targetAliases = list()
+
+ @property
+ def targetType(self):
+ return self._targetType
+
+ @targetType.setter
+ def targetType(self, targetType):
+ if not isinstance(targetType, str):
+ raise TypeError(f"targetType is {type(targetType)}; expected str()")
+
+ if targetType not in self._validTypes:
+ raise ValueError(f"targetType value is {targetType}; expected {self._validTypes}")
+
+ self._targetType = targetType
+
+ @property
+ def targetValue(self):
+ return self._targetValue
+
+ @targetValue.setter
+ def targetValue(self, targetValue):
+ if not isinstance(targetValue, str):
+ raise TypeError(f"targetValue is {type(targetValue)}; expected str()")
+ if not targetValue:
+ raise ValueError("targetValue value is blank")
+
+ self._targetValue = targetValue
+
+ @property
+ def targetAliases(self):
+ return self._targetAliases
+
+ @targetAliases.setter
+ def targetAliases(self, value):
+ self._targetAliases = value
+
+ def setAlias(self, value, typeName):
+ """Specify other hostnames, IPs, etc. that are aliases for this target.
+
+ For instance, if the user searched for an ASN, a module
+ might supply all the nested subnets as aliases.
+ Or, if a user searched for an IP address, a module
+ might supply the hostname as an alias.
+
+ Args:
+ value (str): TBD
+ typeName (str): TBD
+
+ Returns:
+ None
+ """
+ if not isinstance(value, (str, bytes)):
+ return None
+
+ if not value:
+ return None
+
+ if not isinstance(typeName, (str, bytes)):
+ return None
+
+ if {'type': typeName, 'value': value} in self.targetAliases:
+ return None
+
+ self.targetAliases.append(
+ {'type': typeName, 'value': value.lower()}
+ )
+
+ return None
+
+ def _getEquivalents(self, typeName):
+ """TBD
+
+ Returns:
+ list: target aliases
+ """
+
+ ret = list()
+ for item in self.targetAliases:
+ if item['type'] == typeName:
+ ret.append(item['value'].lower())
+ return ret
+
+ def getNames(self):
+ """Get all domains associated with the target.
+
+ Returns:
+ list: domains associated with the target
+ """
+
+ e = self._getEquivalents("INTERNET_NAME")
+ if self.targetType in ["INTERNET_NAME", "EMAILADDR"] and self.targetValue.lower() not in e:
+ e.append(self.targetValue.lower())
+
+ names = list()
+ for name in e:
+ if isinstance(name, bytes):
+ names.append(name.decode("utf-8"))
+ else:
+ names.append(name)
+
+ return names
+
+ def getAddresses(self):
+ """Get all IP Subnets or IP Addresses associated with the target.
+
+ Returns:
+ list: TBD
+ """
+
+ e = self._getEquivalents("IP_ADDRESS")
+ if self.targetType == "IP_ADDRESS":
+ e.append(self.targetValue)
+
+ e = self._getEquivalents("IPV6_ADDRESS")
+ if self.targetType == "IPV6_ADDRESS":
+ e.append(self.targetValue)
+
+ return e
+
+ def matches(self, value, includeParents=False, includeChildren=True):
+ """Check whether the supplied value is "tightly" related
+ to the original target.
+
+ Tightly in this case means:
+ 1. If the value is an IP:
+ 1.1 is it in the list of aliases or the target itself?
+ 1.2 is it on the target's subnet?
+ 2. If the value is a name (subdomain, domain, hostname):
+ 2.1 is it in the list of aliases or the target itself?
+ 2.2 is it a parent of the aliases of the target (domain/subdomain)
+ 2.3 is it a child of the aliases of the target (hostname)
+
+ Args:
+ value (str): can be an Internet Name (hostname, subnet, domain) or an IP address.
+ includeParents (bool): True means you consider a value that is
+ a parent domain of the target to still be a tight relation.
+ includeChildren (bool): False means you don't consider a value
+ that is a child of the target to be a tight relation.
+
+ Returns:
+ bool: whether the value matches the target
+ """
+ if not isinstance(value, str) and not isinstance(value, bytes):
+ return False
+
+ value = value.lower()
+
+ if isinstance(value, bytes):
+ value = value.decode("utf-8")
+
+ if not value:
+ return False
+
+ # We can't really say anything about names, username or phone numbers,
+ # so everything matches
+ if self.targetType in ["HUMAN_NAME", "PHONE_NUMBER", "USERNAME"]:
+ return True
+
+ if netaddr.valid_ipv4(value):
+ # 1.1
+ if value in self.getAddresses():
+ return True
+ # 1.2
+ if self.targetType == "NETBLOCK_OWNER":
+ if netaddr.IPAddress(value) in netaddr.IPNetwork(self.targetValue):
+ return True
+ if self.targetType in ["IP_ADDRESS", "IPV6_ADDRESS"]:
+ if netaddr.IPAddress(value) in netaddr.IPNetwork(netaddr.IPAddress(self.targetValue)):
+ return True
+ else:
+ for name in self.getNames():
+ # 2.1
+ if value == name:
+ return True
+ # 2.2
+ if includeParents and name.endswith("." + value):
+ return True
+ # 2.3
+ if includeChildren and value.endswith("." + name):
+ return True
+
+ return None
+
+# end of SpiderFootTarget class
diff --git a/test/unit/modules/test_sfp__stor_db.py b/test/unit/modules/test_sfp__stor_db.py
index 4c2230c9..bb8566af 100644
--- a/test/unit/modules/test_sfp__stor_db.py
+++ b/test/unit/modules/test_sfp__stor_db.py
@@ -1,5 +1,6 @@
# test_sfp__stor_db.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp__stor_db import sfp__stor_db
diff --git a/test/unit/modules/test_sfp__stor_stdout.py b/test/unit/modules/test_sfp__stor_stdout.py
index b556030a..b4d4263f 100644
--- a/test/unit/modules/test_sfp__stor_stdout.py
+++ b/test/unit/modules/test_sfp__stor_stdout.py
@@ -1,5 +1,6 @@
# test_sfp__stor_stdout.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp__stor_stdout import sfp__stor_stdout
diff --git a/test/unit/modules/test_sfp_abusech.py b/test/unit/modules/test_sfp_abusech.py
index e05d844b..3d730915 100644
--- a/test/unit/modules/test_sfp_abusech.py
+++ b/test/unit/modules/test_sfp_abusech.py
@@ -1,5 +1,6 @@
# test_sfp_abusech.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_abusech import sfp_abusech
diff --git a/test/unit/modules/test_sfp_abuseipdb.py b/test/unit/modules/test_sfp_abuseipdb.py
index b0202cf8..bfcb641a 100644
--- a/test/unit/modules/test_sfp_abuseipdb.py
+++ b/test/unit/modules/test_sfp_abuseipdb.py
@@ -1,5 +1,6 @@
# test_sfp_abuseipdb.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_abuseipdb import sfp_abuseipdb
diff --git a/test/unit/modules/test_sfp_accounts.py b/test/unit/modules/test_sfp_accounts.py
index 0f16ac6b..ede4f939 100644
--- a/test/unit/modules/test_sfp_accounts.py
+++ b/test/unit/modules/test_sfp_accounts.py
@@ -1,5 +1,6 @@
# test_sfp_accounts.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_accounts import sfp_accounts
diff --git a/test/unit/modules/test_sfp_adblock.py b/test/unit/modules/test_sfp_adblock.py
index b37c92b2..33c60cf9 100644
--- a/test/unit/modules/test_sfp_adblock.py
+++ b/test/unit/modules/test_sfp_adblock.py
@@ -1,5 +1,6 @@
# test_sfp_adblock.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_adblock import sfp_adblock
diff --git a/test/unit/modules/test_sfp_ahmia.py b/test/unit/modules/test_sfp_ahmia.py
index 8399a71a..0d93c683 100644
--- a/test/unit/modules/test_sfp_ahmia.py
+++ b/test/unit/modules/test_sfp_ahmia.py
@@ -1,5 +1,6 @@
# test_sfp_ahmia.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_ahmia import sfp_ahmia
diff --git a/test/unit/modules/test_sfp_alienvault.py b/test/unit/modules/test_sfp_alienvault.py
index d7d4e353..8336bd5c 100644
--- a/test/unit/modules/test_sfp_alienvault.py
+++ b/test/unit/modules/test_sfp_alienvault.py
@@ -1,5 +1,6 @@
# test_sfp_alienvault.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_alienvault import sfp_alienvault
diff --git a/test/unit/modules/test_sfp_alienvaultiprep.py b/test/unit/modules/test_sfp_alienvaultiprep.py
index 1be27678..3e88158c 100644
--- a/test/unit/modules/test_sfp_alienvaultiprep.py
+++ b/test/unit/modules/test_sfp_alienvaultiprep.py
@@ -1,5 +1,6 @@
# test_sfp_alienvaultiprep.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_alienvaultiprep import sfp_alienvaultiprep
diff --git a/test/unit/modules/test_sfp_api_recon_dev.py b/test/unit/modules/test_sfp_api_recon_dev.py
index 814b7b11..f68199de 100644
--- a/test/unit/modules/test_sfp_api_recon_dev.py
+++ b/test/unit/modules/test_sfp_api_recon_dev.py
@@ -1,5 +1,6 @@
# test_sfp_api_recon_dev.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_api_recon_dev import sfp_api_recon_dev
diff --git a/test/unit/modules/test_sfp_apility.py b/test/unit/modules/test_sfp_apility.py
index fe756d56..5273c695 100644
--- a/test/unit/modules/test_sfp_apility.py
+++ b/test/unit/modules/test_sfp_apility.py
@@ -1,5 +1,6 @@
# test_sfp_apility.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_apility import sfp_apility
diff --git a/test/unit/modules/test_sfp_archiveorg.py b/test/unit/modules/test_sfp_archiveorg.py
index f5408608..7d0c0da2 100644
--- a/test/unit/modules/test_sfp_archiveorg.py
+++ b/test/unit/modules/test_sfp_archiveorg.py
@@ -1,5 +1,6 @@
# test_sfp_archiveorg.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_archiveorg import sfp_archiveorg
diff --git a/test/unit/modules/test_sfp_arin.py b/test/unit/modules/test_sfp_arin.py
index b61bbc23..30efee1c 100644
--- a/test/unit/modules/test_sfp_arin.py
+++ b/test/unit/modules/test_sfp_arin.py
@@ -1,5 +1,6 @@
# test_sfp_arin.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_arin import sfp_arin
diff --git a/test/unit/modules/test_sfp_azureblobstorage.py b/test/unit/modules/test_sfp_azureblobstorage.py
index 23d13d39..2766a0e1 100644
--- a/test/unit/modules/test_sfp_azureblobstorage.py
+++ b/test/unit/modules/test_sfp_azureblobstorage.py
@@ -1,5 +1,6 @@
# test_sfp_azureblobstorage.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_azureblobstorage import sfp_azureblobstorage
diff --git a/test/unit/modules/test_sfp_badipscom.py b/test/unit/modules/test_sfp_badipscom.py
index 3293fd2d..6931e85d 100644
--- a/test/unit/modules/test_sfp_badipscom.py
+++ b/test/unit/modules/test_sfp_badipscom.py
@@ -1,5 +1,6 @@
# test_sfp_badipscom.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_badipscom import sfp_badipscom
diff --git a/test/unit/modules/test_sfp_badpackets.py b/test/unit/modules/test_sfp_badpackets.py
index 2f484190..7532abe5 100644
--- a/test/unit/modules/test_sfp_badpackets.py
+++ b/test/unit/modules/test_sfp_badpackets.py
@@ -1,5 +1,6 @@
# test_sfp_badpackets.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_badpackets import sfp_badpackets
diff --git a/test/unit/modules/test_sfp_bambenek.py b/test/unit/modules/test_sfp_bambenek.py
index 9376b9cc..ebb082a8 100644
--- a/test/unit/modules/test_sfp_bambenek.py
+++ b/test/unit/modules/test_sfp_bambenek.py
@@ -1,5 +1,6 @@
# test_sfp_bambenek.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_bambenek import sfp_bambenek
diff --git a/test/unit/modules/test_sfp_base64.py b/test/unit/modules/test_sfp_base64.py
index 08ffa311..e86e7872 100644
--- a/test/unit/modules/test_sfp_base64.py
+++ b/test/unit/modules/test_sfp_base64.py
@@ -1,5 +1,6 @@
# test_sfp_base64.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_base64 import sfp_base64
diff --git a/test/unit/modules/test_sfp_bgpview.py b/test/unit/modules/test_sfp_bgpview.py
index b544e6b0..bed3e93e 100644
--- a/test/unit/modules/test_sfp_bgpview.py
+++ b/test/unit/modules/test_sfp_bgpview.py
@@ -1,5 +1,6 @@
# test_sfp_bgpview.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_bgpview import sfp_bgpview
diff --git a/test/unit/modules/test_sfp_binaryedge.py b/test/unit/modules/test_sfp_binaryedge.py
index 84efbcad..3fd1dd34 100644
--- a/test/unit/modules/test_sfp_binaryedge.py
+++ b/test/unit/modules/test_sfp_binaryedge.py
@@ -1,5 +1,6 @@
# test_sfp_binaryedge.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_binaryedge import sfp_binaryedge
diff --git a/test/unit/modules/test_sfp_bingsearch.py b/test/unit/modules/test_sfp_bingsearch.py
index 3913bab6..d09f8d00 100644
--- a/test/unit/modules/test_sfp_bingsearch.py
+++ b/test/unit/modules/test_sfp_bingsearch.py
@@ -1,5 +1,6 @@
# test_sfp_bingsearch.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_bingsearch import sfp_bingsearch
diff --git a/test/unit/modules/test_sfp_bingsharedip.py b/test/unit/modules/test_sfp_bingsharedip.py
index a6623e5e..1dd3f82c 100644
--- a/test/unit/modules/test_sfp_bingsharedip.py
+++ b/test/unit/modules/test_sfp_bingsharedip.py
@@ -1,5 +1,6 @@
# test_sfp_bingsharedip.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_bingsharedip import sfp_bingsharedip
diff --git a/test/unit/modules/test_sfp_binstring.py b/test/unit/modules/test_sfp_binstring.py
index 157a5eea..e1820d9c 100644
--- a/test/unit/modules/test_sfp_binstring.py
+++ b/test/unit/modules/test_sfp_binstring.py
@@ -1,5 +1,6 @@
# test_sfp_binstring.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_binstring import sfp_binstring
diff --git a/test/unit/modules/test_sfp_bitcoin.py b/test/unit/modules/test_sfp_bitcoin.py
index 5b374b51..c33475cf 100644
--- a/test/unit/modules/test_sfp_bitcoin.py
+++ b/test/unit/modules/test_sfp_bitcoin.py
@@ -1,5 +1,6 @@
# test_sfp_bitcoin.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_bitcoin import sfp_bitcoin
diff --git a/test/unit/modules/test_sfp_blockchain.py b/test/unit/modules/test_sfp_blockchain.py
index 1e4530e4..57e5a250 100644
--- a/test/unit/modules/test_sfp_blockchain.py
+++ b/test/unit/modules/test_sfp_blockchain.py
@@ -1,5 +1,6 @@
# test_sfp_blockchain.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_blockchain import sfp_blockchain
diff --git a/test/unit/modules/test_sfp_blocklistde.py b/test/unit/modules/test_sfp_blocklistde.py
index 8ec059be..cd4f4ae8 100644
--- a/test/unit/modules/test_sfp_blocklistde.py
+++ b/test/unit/modules/test_sfp_blocklistde.py
@@ -1,5 +1,6 @@
# test_sfp_blocklistde.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_blocklistde import sfp_blocklistde
diff --git a/test/unit/modules/test_sfp_botscout.py b/test/unit/modules/test_sfp_botscout.py
index 776df191..52b123a7 100644
--- a/test/unit/modules/test_sfp_botscout.py
+++ b/test/unit/modules/test_sfp_botscout.py
@@ -1,5 +1,6 @@
# test_sfp_botscout.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_botscout import sfp_botscout
diff --git a/test/unit/modules/test_sfp_botvrij.py b/test/unit/modules/test_sfp_botvrij.py
index 8c974519..13587c07 100644
--- a/test/unit/modules/test_sfp_botvrij.py
+++ b/test/unit/modules/test_sfp_botvrij.py
@@ -1,5 +1,6 @@
# test_sfp_botvrij.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_botvrij import sfp_botvrij
diff --git a/test/unit/modules/test_sfp_builtwith.py b/test/unit/modules/test_sfp_builtwith.py
index 45590007..13c480f5 100644
--- a/test/unit/modules/test_sfp_builtwith.py
+++ b/test/unit/modules/test_sfp_builtwith.py
@@ -1,5 +1,6 @@
# test_sfp_builtwith.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_builtwith import sfp_builtwith
diff --git a/test/unit/modules/test_sfp_callername.py b/test/unit/modules/test_sfp_callername.py
index aa2468cc..a79ac4fd 100644
--- a/test/unit/modules/test_sfp_callername.py
+++ b/test/unit/modules/test_sfp_callername.py
@@ -1,5 +1,6 @@
# test_sfp_callername.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_callername import sfp_callername
diff --git a/test/unit/modules/test_sfp_censys.py b/test/unit/modules/test_sfp_censys.py
index 50bd2d7f..d63293ee 100644
--- a/test/unit/modules/test_sfp_censys.py
+++ b/test/unit/modules/test_sfp_censys.py
@@ -1,5 +1,6 @@
# test_sfp_censys.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_censys import sfp_censys
diff --git a/test/unit/modules/test_sfp_cinsscore.py b/test/unit/modules/test_sfp_cinsscore.py
index ff681430..af1d10ee 100644
--- a/test/unit/modules/test_sfp_cinsscore.py
+++ b/test/unit/modules/test_sfp_cinsscore.py
@@ -1,5 +1,6 @@
# test_sfp_cinsscore.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_cinsscore import sfp_cinsscore
diff --git a/test/unit/modules/test_sfp_circllu.py b/test/unit/modules/test_sfp_circllu.py
index 944a6dd2..3fa391a1 100644
--- a/test/unit/modules/test_sfp_circllu.py
+++ b/test/unit/modules/test_sfp_circllu.py
@@ -1,5 +1,6 @@
# test_sfp_circllu.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_circllu import sfp_circllu
diff --git a/test/unit/modules/test_sfp_citadel.py b/test/unit/modules/test_sfp_citadel.py
index 91de24c8..357d0c82 100644
--- a/test/unit/modules/test_sfp_citadel.py
+++ b/test/unit/modules/test_sfp_citadel.py
@@ -1,5 +1,6 @@
# test_sfp_citadel.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_citadel import sfp_citadel
diff --git a/test/unit/modules/test_sfp_cleanbrowsing.py b/test/unit/modules/test_sfp_cleanbrowsing.py
index fe36b1b0..b65d3095 100644
--- a/test/unit/modules/test_sfp_cleanbrowsing.py
+++ b/test/unit/modules/test_sfp_cleanbrowsing.py
@@ -1,5 +1,6 @@
# test_sfp_cleanbrowsing.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_cleanbrowsing import sfp_cleanbrowsing
diff --git a/test/unit/modules/test_sfp_cleantalk.py b/test/unit/modules/test_sfp_cleantalk.py
index 172530a8..922cb98a 100644
--- a/test/unit/modules/test_sfp_cleantalk.py
+++ b/test/unit/modules/test_sfp_cleantalk.py
@@ -1,5 +1,6 @@
# test_sfp_cleantalk.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_cleantalk import sfp_cleantalk
diff --git a/test/unit/modules/test_sfp_clearbit.py b/test/unit/modules/test_sfp_clearbit.py
index 3d2e4150..ed4263c2 100644
--- a/test/unit/modules/test_sfp_clearbit.py
+++ b/test/unit/modules/test_sfp_clearbit.py
@@ -1,5 +1,6 @@
# test_sfp_clearbit.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_clearbit import sfp_clearbit
diff --git a/test/unit/modules/test_sfp_cloudflaredns.py b/test/unit/modules/test_sfp_cloudflaredns.py
index b9b8d559..08c8e929 100644
--- a/test/unit/modules/test_sfp_cloudflaredns.py
+++ b/test/unit/modules/test_sfp_cloudflaredns.py
@@ -1,5 +1,6 @@
# test_sfp_cloudflaredns.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_cloudflaredns import sfp_cloudflaredns
diff --git a/test/unit/modules/test_sfp_coinblocker.py b/test/unit/modules/test_sfp_coinblocker.py
index bc459346..cfcafd81 100644
--- a/test/unit/modules/test_sfp_coinblocker.py
+++ b/test/unit/modules/test_sfp_coinblocker.py
@@ -1,5 +1,6 @@
# test_sfp_coinblocker.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_coinblocker import sfp_coinblocker
diff --git a/test/unit/modules/test_sfp_commoncrawl.py b/test/unit/modules/test_sfp_commoncrawl.py
index 4fa3b4dc..5cd6ee7d 100644
--- a/test/unit/modules/test_sfp_commoncrawl.py
+++ b/test/unit/modules/test_sfp_commoncrawl.py
@@ -1,5 +1,6 @@
# test_sfp_commoncrawl.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_commoncrawl import sfp_commoncrawl
diff --git a/test/unit/modules/test_sfp_comodo.py b/test/unit/modules/test_sfp_comodo.py
index 19da1fcd..e191e894 100644
--- a/test/unit/modules/test_sfp_comodo.py
+++ b/test/unit/modules/test_sfp_comodo.py
@@ -1,5 +1,6 @@
# test_sfp_comodo.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_comodo import sfp_comodo
diff --git a/test/unit/modules/test_sfp_company.py b/test/unit/modules/test_sfp_company.py
index be56221d..3f216840 100644
--- a/test/unit/modules/test_sfp_company.py
+++ b/test/unit/modules/test_sfp_company.py
@@ -1,5 +1,6 @@
# test_sfp_company.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_company import sfp_company
diff --git a/test/unit/modules/test_sfp_cookie.py b/test/unit/modules/test_sfp_cookie.py
index aea3a1ea..6987e077 100644
--- a/test/unit/modules/test_sfp_cookie.py
+++ b/test/unit/modules/test_sfp_cookie.py
@@ -1,5 +1,6 @@
# test_sfp_cookie.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_cookie import sfp_cookie
diff --git a/test/unit/modules/test_sfp_countryname.py b/test/unit/modules/test_sfp_countryname.py
index 29ecc192..10d147f1 100644
--- a/test/unit/modules/test_sfp_countryname.py
+++ b/test/unit/modules/test_sfp_countryname.py
@@ -1,5 +1,6 @@
# test_sfp_countryname.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_countryname import sfp_countryname
diff --git a/test/unit/modules/test_sfp_creditcard.py b/test/unit/modules/test_sfp_creditcard.py
index 52b33c08..65104be0 100644
--- a/test/unit/modules/test_sfp_creditcard.py
+++ b/test/unit/modules/test_sfp_creditcard.py
@@ -1,5 +1,6 @@
# test_sfp_creditcard.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_creditcard import sfp_creditcard
diff --git a/test/unit/modules/test_sfp_crobat_api.py b/test/unit/modules/test_sfp_crobat_api.py
index a1bb584e..da8a43c6 100644
--- a/test/unit/modules/test_sfp_crobat_api.py
+++ b/test/unit/modules/test_sfp_crobat_api.py
@@ -1,5 +1,6 @@
# test_sfp_crobat_api.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_crobat_api import sfp_crobat_api
diff --git a/test/unit/modules/test_sfp_crossref.py b/test/unit/modules/test_sfp_crossref.py
index f401d29a..29f9a3fd 100644
--- a/test/unit/modules/test_sfp_crossref.py
+++ b/test/unit/modules/test_sfp_crossref.py
@@ -1,5 +1,6 @@
# test_sfp_crossref.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_crossref import sfp_crossref
diff --git a/test/unit/modules/test_sfp_crt.py b/test/unit/modules/test_sfp_crt.py
index 7a19ae35..d1a9c667 100644
--- a/test/unit/modules/test_sfp_crt.py
+++ b/test/unit/modules/test_sfp_crt.py
@@ -1,5 +1,6 @@
# test_sfp_crt.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_crt import sfp_crt
diff --git a/test/unit/modules/test_sfp_customfeed.py b/test/unit/modules/test_sfp_customfeed.py
index cff5dcec..f6730195 100644
--- a/test/unit/modules/test_sfp_customfeed.py
+++ b/test/unit/modules/test_sfp_customfeed.py
@@ -1,5 +1,6 @@
# test_sfp_customfeed.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_customfeed import sfp_customfeed
diff --git a/test/unit/modules/test_sfp_cybercrimetracker.py b/test/unit/modules/test_sfp_cybercrimetracker.py
index 26116b58..0f29d6ff 100644
--- a/test/unit/modules/test_sfp_cybercrimetracker.py
+++ b/test/unit/modules/test_sfp_cybercrimetracker.py
@@ -1,5 +1,6 @@
# test_sfp_cybercrimetracker.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_cybercrimetracker import sfp_cybercrimetracker
diff --git a/test/unit/modules/test_sfp_darksearch.py b/test/unit/modules/test_sfp_darksearch.py
index 160d7c08..52c599c7 100644
--- a/test/unit/modules/test_sfp_darksearch.py
+++ b/test/unit/modules/test_sfp_darksearch.py
@@ -1,5 +1,6 @@
# test_sfp_darksearch.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_darksearch import sfp_darksearch
diff --git a/test/unit/modules/test_sfp_digitaloceanspace.py b/test/unit/modules/test_sfp_digitaloceanspace.py
index b9ea64e3..73e6aeaf 100644
--- a/test/unit/modules/test_sfp_digitaloceanspace.py
+++ b/test/unit/modules/test_sfp_digitaloceanspace.py
@@ -1,5 +1,6 @@
# test_sfp_digitaloceanspace.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_digitaloceanspace import sfp_digitaloceanspace
diff --git a/test/unit/modules/test_sfp_dnsbrute.py b/test/unit/modules/test_sfp_dnsbrute.py
index 99047594..6541da02 100644
--- a/test/unit/modules/test_sfp_dnsbrute.py
+++ b/test/unit/modules/test_sfp_dnsbrute.py
@@ -1,5 +1,6 @@
# test_sfp_dnsbrute.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnsbrute import sfp_dnsbrute
diff --git a/test/unit/modules/test_sfp_dnscommonsrv.py b/test/unit/modules/test_sfp_dnscommonsrv.py
index 3f911f37..9ae5893e 100644
--- a/test/unit/modules/test_sfp_dnscommonsrv.py
+++ b/test/unit/modules/test_sfp_dnscommonsrv.py
@@ -1,5 +1,6 @@
# test_sfp_dnscommonsrv.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnscommonsrv import sfp_dnscommonsrv
diff --git a/test/unit/modules/test_sfp_dnsgrep.py b/test/unit/modules/test_sfp_dnsgrep.py
index 3b4830df..acc58211 100644
--- a/test/unit/modules/test_sfp_dnsgrep.py
+++ b/test/unit/modules/test_sfp_dnsgrep.py
@@ -1,5 +1,6 @@
# test_sfp_dnsgrep.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnsgrep import sfp_dnsgrep
diff --git a/test/unit/modules/test_sfp_dnsneighbor.py b/test/unit/modules/test_sfp_dnsneighbor.py
index 9d5927f6..e8e4644a 100644
--- a/test/unit/modules/test_sfp_dnsneighbor.py
+++ b/test/unit/modules/test_sfp_dnsneighbor.py
@@ -1,5 +1,6 @@
# test_sfp_dnsneighbor.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnsneighbor import sfp_dnsneighbor
diff --git a/test/unit/modules/test_sfp_dnsraw.py b/test/unit/modules/test_sfp_dnsraw.py
index 9e514025..0e9b7ac3 100644
--- a/test/unit/modules/test_sfp_dnsraw.py
+++ b/test/unit/modules/test_sfp_dnsraw.py
@@ -1,5 +1,6 @@
# test_sfp_dnsraw.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnsraw import sfp_dnsraw
diff --git a/test/unit/modules/test_sfp_dnsresolve.py b/test/unit/modules/test_sfp_dnsresolve.py
index 1e5fb2f2..15884955 100644
--- a/test/unit/modules/test_sfp_dnsresolve.py
+++ b/test/unit/modules/test_sfp_dnsresolve.py
@@ -1,5 +1,6 @@
# test_sfp_dnsresolve.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnsresolve import sfp_dnsresolve
diff --git a/test/unit/modules/test_sfp_dnszonexfer.py b/test/unit/modules/test_sfp_dnszonexfer.py
index 15c35ffe..b799885b 100644
--- a/test/unit/modules/test_sfp_dnszonexfer.py
+++ b/test/unit/modules/test_sfp_dnszonexfer.py
@@ -1,5 +1,6 @@
# test_sfp_dnszonexfer.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dnszonexfer import sfp_dnszonexfer
diff --git a/test/unit/modules/test_sfp_dronebl.py b/test/unit/modules/test_sfp_dronebl.py
index cea9d977..e80ebdd8 100644
--- a/test/unit/modules/test_sfp_dronebl.py
+++ b/test/unit/modules/test_sfp_dronebl.py
@@ -1,5 +1,6 @@
# test_sfp_dronebl.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_dronebl import sfp_dronebl
diff --git a/test/unit/modules/test_sfp_duckduckgo.py b/test/unit/modules/test_sfp_duckduckgo.py
index 6ef6988b..9676ec34 100644
--- a/test/unit/modules/test_sfp_duckduckgo.py
+++ b/test/unit/modules/test_sfp_duckduckgo.py
@@ -1,5 +1,6 @@
# test_sfp_duckduckgo.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_duckduckgo import sfp_duckduckgo
diff --git a/test/unit/modules/test_sfp_email.py b/test/unit/modules/test_sfp_email.py
index 04dd514d..d08f2439 100644
--- a/test/unit/modules/test_sfp_email.py
+++ b/test/unit/modules/test_sfp_email.py
@@ -1,5 +1,6 @@
# test_sfp_email.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_email import sfp_email
diff --git a/test/unit/modules/test_sfp_emailcrawlr.py b/test/unit/modules/test_sfp_emailcrawlr.py
index 2c1d21da..c8395b1f 100644
--- a/test/unit/modules/test_sfp_emailcrawlr.py
+++ b/test/unit/modules/test_sfp_emailcrawlr.py
@@ -1,5 +1,6 @@
# test_sfp_emailcrawlr.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_emailcrawlr import sfp_emailcrawlr
diff --git a/test/unit/modules/test_sfp_emailformat.py b/test/unit/modules/test_sfp_emailformat.py
index 96dba150..b1bb00a8 100644
--- a/test/unit/modules/test_sfp_emailformat.py
+++ b/test/unit/modules/test_sfp_emailformat.py
@@ -1,5 +1,6 @@
# test_sfp_emailformat.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_emailformat import sfp_emailformat
diff --git a/test/unit/modules/test_sfp_emailrep.py b/test/unit/modules/test_sfp_emailrep.py
index fa00c729..33923a14 100644
--- a/test/unit/modules/test_sfp_emailrep.py
+++ b/test/unit/modules/test_sfp_emailrep.py
@@ -1,5 +1,6 @@
# test_sfp_emailrep.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_emailrep import sfp_emailrep
diff --git a/test/unit/modules/test_sfp_emergingthreats.py b/test/unit/modules/test_sfp_emergingthreats.py
index 45a4e0f7..365cc29f 100644
--- a/test/unit/modules/test_sfp_emergingthreats.py
+++ b/test/unit/modules/test_sfp_emergingthreats.py
@@ -1,5 +1,6 @@
# test_sfp_emergingthreats.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_emergingthreats import sfp_emergingthreats
diff --git a/test/unit/modules/test_sfp_errors.py b/test/unit/modules/test_sfp_errors.py
index c296391a..71379f85 100644
--- a/test/unit/modules/test_sfp_errors.py
+++ b/test/unit/modules/test_sfp_errors.py
@@ -1,5 +1,6 @@
# test_sfp_errors.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_errors import sfp_errors
diff --git a/test/unit/modules/test_sfp_ethereum.py b/test/unit/modules/test_sfp_ethereum.py
index a0f368fb..f8fe5e65 100644
--- a/test/unit/modules/test_sfp_ethereum.py
+++ b/test/unit/modules/test_sfp_ethereum.py
@@ -1,5 +1,6 @@
# test_sfp_ethereum.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_ethereum import sfp_ethereum
diff --git a/test/unit/modules/test_sfp_filemeta.py b/test/unit/modules/test_sfp_filemeta.py
index 2340b8fc..304e4fd6 100644
--- a/test/unit/modules/test_sfp_filemeta.py
+++ b/test/unit/modules/test_sfp_filemeta.py
@@ -1,5 +1,6 @@
# test_sfp_filemeta.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_filemeta import sfp_filemeta
diff --git a/test/unit/modules/test_sfp_flickr.py b/test/unit/modules/test_sfp_flickr.py
index 9b3aae75..6a2b3c8e 100644
--- a/test/unit/modules/test_sfp_flickr.py
+++ b/test/unit/modules/test_sfp_flickr.py
@@ -1,5 +1,6 @@
# test_sfp_flickr.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_flickr import sfp_flickr
diff --git a/test/unit/modules/test_sfp_fortinet.py b/test/unit/modules/test_sfp_fortinet.py
index e67afccd..a5390685 100644
--- a/test/unit/modules/test_sfp_fortinet.py
+++ b/test/unit/modules/test_sfp_fortinet.py
@@ -1,5 +1,6 @@
# test_sfp_fortinet.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_fortinet import sfp_fortinet
diff --git a/test/unit/modules/test_sfp_fraudguard.py b/test/unit/modules/test_sfp_fraudguard.py
index e8f150d4..f2ea0855 100644
--- a/test/unit/modules/test_sfp_fraudguard.py
+++ b/test/unit/modules/test_sfp_fraudguard.py
@@ -1,5 +1,6 @@
# test_sfp_fraudguard.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_fraudguard import sfp_fraudguard
diff --git a/test/unit/modules/test_sfp_fringeproject.py b/test/unit/modules/test_sfp_fringeproject.py
index 98095b07..0c3d6047 100644
--- a/test/unit/modules/test_sfp_fringeproject.py
+++ b/test/unit/modules/test_sfp_fringeproject.py
@@ -1,5 +1,6 @@
# test_sfp_fringeproject.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_fringeproject import sfp_fringeproject
diff --git a/test/unit/modules/test_sfp_fsecure_riddler.py b/test/unit/modules/test_sfp_fsecure_riddler.py
index 4b42770d..3c4176d2 100644
--- a/test/unit/modules/test_sfp_fsecure_riddler.py
+++ b/test/unit/modules/test_sfp_fsecure_riddler.py
@@ -1,5 +1,6 @@
# test_sfp_fsecure_riddler.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_fsecure_riddler import sfp_fsecure_riddler
diff --git a/test/unit/modules/test_sfp_fullcontact.py b/test/unit/modules/test_sfp_fullcontact.py
index 923c2882..7e2b6907 100644
--- a/test/unit/modules/test_sfp_fullcontact.py
+++ b/test/unit/modules/test_sfp_fullcontact.py
@@ -1,5 +1,6 @@
# test_sfp_fullcontact.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_fullcontact import sfp_fullcontact
diff --git a/test/unit/modules/test_sfp_github.py b/test/unit/modules/test_sfp_github.py
index a5cf5d3b..9f13547b 100644
--- a/test/unit/modules/test_sfp_github.py
+++ b/test/unit/modules/test_sfp_github.py
@@ -1,5 +1,6 @@
# test_sfp_github.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_github import sfp_github
diff --git a/test/unit/modules/test_sfp_googlemaps.py b/test/unit/modules/test_sfp_googlemaps.py
index 2d65aee3..0ff38ebf 100644
--- a/test/unit/modules/test_sfp_googlemaps.py
+++ b/test/unit/modules/test_sfp_googlemaps.py
@@ -1,5 +1,6 @@
# test_sfp_googlemaps.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_googlemaps import sfp_googlemaps
diff --git a/test/unit/modules/test_sfp_googleobjectstorage.py b/test/unit/modules/test_sfp_googleobjectstorage.py
index 210a0cdf..31b636fa 100644
--- a/test/unit/modules/test_sfp_googleobjectstorage.py
+++ b/test/unit/modules/test_sfp_googleobjectstorage.py
@@ -1,5 +1,6 @@
# test_sfp_googleobjectstorage.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_googleobjectstorage import sfp_googleobjectstorage
diff --git a/test/unit/modules/test_sfp_googlesafebrowsing.py b/test/unit/modules/test_sfp_googlesafebrowsing.py
index 5a9baa72..4694dda8 100644
--- a/test/unit/modules/test_sfp_googlesafebrowsing.py
+++ b/test/unit/modules/test_sfp_googlesafebrowsing.py
@@ -1,5 +1,6 @@
# test_sfp_googlesafebrowsing.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_googlesafebrowsing import sfp_googlesafebrowsing
diff --git a/test/unit/modules/test_sfp_googlesearch.py b/test/unit/modules/test_sfp_googlesearch.py
index fd41a352..e9538813 100644
--- a/test/unit/modules/test_sfp_googlesearch.py
+++ b/test/unit/modules/test_sfp_googlesearch.py
@@ -1,5 +1,6 @@
# test_sfp_googlesearch.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_googlesearch import sfp_googlesearch
diff --git a/test/unit/modules/test_sfp_gravatar.py b/test/unit/modules/test_sfp_gravatar.py
index eb945525..b35962d2 100644
--- a/test/unit/modules/test_sfp_gravatar.py
+++ b/test/unit/modules/test_sfp_gravatar.py
@@ -1,5 +1,6 @@
# test_sfp_gravatar.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_gravatar import sfp_gravatar
diff --git a/test/unit/modules/test_sfp_greensnow.py b/test/unit/modules/test_sfp_greensnow.py
index 9c154c1c..7fef1cc1 100644
--- a/test/unit/modules/test_sfp_greensnow.py
+++ b/test/unit/modules/test_sfp_greensnow.py
@@ -1,5 +1,6 @@
# test_sfp_greensnow.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_greensnow import sfp_greensnow
diff --git a/test/unit/modules/test_sfp_grep_app.py b/test/unit/modules/test_sfp_grep_app.py
index d3e506ea..978f22b3 100644
--- a/test/unit/modules/test_sfp_grep_app.py
+++ b/test/unit/modules/test_sfp_grep_app.py
@@ -1,5 +1,6 @@
# test_sfp_grep_app.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_grep_app import sfp_grep_app
diff --git a/test/unit/modules/test_sfp_greynoise.py b/test/unit/modules/test_sfp_greynoise.py
index 93d4c749..da64faad 100644
--- a/test/unit/modules/test_sfp_greynoise.py
+++ b/test/unit/modules/test_sfp_greynoise.py
@@ -1,5 +1,6 @@
# test_sfp_greynoise.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_greynoise import sfp_greynoise
diff --git a/test/unit/modules/test_sfp_h1nobbdde.py b/test/unit/modules/test_sfp_h1nobbdde.py
index b3563a71..36be802f 100644
--- a/test/unit/modules/test_sfp_h1nobbdde.py
+++ b/test/unit/modules/test_sfp_h1nobbdde.py
@@ -1,5 +1,6 @@
# test_sfp_h1nobbdde.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_h1nobbdde import sfp_h1nobbdde
diff --git a/test/unit/modules/test_sfp_hackertarget.py b/test/unit/modules/test_sfp_hackertarget.py
index eb23e82c..2618cdf6 100644
--- a/test/unit/modules/test_sfp_hackertarget.py
+++ b/test/unit/modules/test_sfp_hackertarget.py
@@ -1,5 +1,6 @@
# test_sfp_hackertarget.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_hackertarget import sfp_hackertarget
diff --git a/test/unit/modules/test_sfp_hashes.py b/test/unit/modules/test_sfp_hashes.py
index 8cdd9fec..52c4762f 100644
--- a/test/unit/modules/test_sfp_hashes.py
+++ b/test/unit/modules/test_sfp_hashes.py
@@ -1,5 +1,6 @@
# test_sfp_hashes.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_hashes import sfp_hashes
diff --git a/test/unit/modules/test_sfp_haveibeenpwned.py b/test/unit/modules/test_sfp_haveibeenpwned.py
index e65e2772..a1a44055 100644
--- a/test/unit/modules/test_sfp_haveibeenpwned.py
+++ b/test/unit/modules/test_sfp_haveibeenpwned.py
@@ -1,5 +1,6 @@
# test_sfp_haveibeenpwned.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_haveibeenpwned import sfp_haveibeenpwned
diff --git a/test/unit/modules/test_sfp_honeypot.py b/test/unit/modules/test_sfp_honeypot.py
index ee3bf08e..79f3c0a8 100644
--- a/test/unit/modules/test_sfp_honeypot.py
+++ b/test/unit/modules/test_sfp_honeypot.py
@@ -1,5 +1,6 @@
# test_sfp_honeypot.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_honeypot import sfp_honeypot
diff --git a/test/unit/modules/test_sfp_hosting.py b/test/unit/modules/test_sfp_hosting.py
index 92c8a9c2..bd271805 100644
--- a/test/unit/modules/test_sfp_hosting.py
+++ b/test/unit/modules/test_sfp_hosting.py
@@ -1,5 +1,6 @@
# test_sfp_hosting.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_hosting import sfp_hosting
diff --git a/test/unit/modules/test_sfp_hostio.py b/test/unit/modules/test_sfp_hostio.py
index edc7c6cc..666e555a 100644
--- a/test/unit/modules/test_sfp_hostio.py
+++ b/test/unit/modules/test_sfp_hostio.py
@@ -1,5 +1,6 @@
# test_sfp_hostio.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_hostio import sfp_hostio
diff --git a/test/unit/modules/test_sfp_hunter.py b/test/unit/modules/test_sfp_hunter.py
index 78b2e917..5d6a9004 100644
--- a/test/unit/modules/test_sfp_hunter.py
+++ b/test/unit/modules/test_sfp_hunter.py
@@ -1,5 +1,6 @@
# test_sfp_hunter.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_hunter import sfp_hunter
diff --git a/test/unit/modules/test_sfp_hybrid_analysis.py b/test/unit/modules/test_sfp_hybrid_analysis.py
index 2acf5159..d1784d89 100644
--- a/test/unit/modules/test_sfp_hybrid_analysis.py
+++ b/test/unit/modules/test_sfp_hybrid_analysis.py
@@ -1,5 +1,6 @@
# test_sfp_hybrid_analysis.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_hybrid_analysis import sfp_hybrid_analysis
diff --git a/test/unit/modules/test_sfp_iban.py b/test/unit/modules/test_sfp_iban.py
index 89437cd6..cba95055 100644
--- a/test/unit/modules/test_sfp_iban.py
+++ b/test/unit/modules/test_sfp_iban.py
@@ -1,5 +1,6 @@
# test_sfp_iban.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_iban import sfp_iban
diff --git a/test/unit/modules/test_sfp_iknowwhatyoudownload.py b/test/unit/modules/test_sfp_iknowwhatyoudownload.py
index cfc5076b..0c0865d0 100644
--- a/test/unit/modules/test_sfp_iknowwhatyoudownload.py
+++ b/test/unit/modules/test_sfp_iknowwhatyoudownload.py
@@ -1,5 +1,6 @@
# test_sfp_iknowwhatyoudownload.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_iknowwhatyoudownload import sfp_iknowwhatyoudownload
diff --git a/test/unit/modules/test_sfp_instagram.py b/test/unit/modules/test_sfp_instagram.py
index 807459e3..c4e32c7b 100644
--- a/test/unit/modules/test_sfp_instagram.py
+++ b/test/unit/modules/test_sfp_instagram.py
@@ -1,5 +1,6 @@
# test_sfp_instagram.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_instagram import sfp_instagram
diff --git a/test/unit/modules/test_sfp_intelx.py b/test/unit/modules/test_sfp_intelx.py
index 04de93de..5d25ed78 100644
--- a/test/unit/modules/test_sfp_intelx.py
+++ b/test/unit/modules/test_sfp_intelx.py
@@ -1,5 +1,6 @@
# test_sfp_intelx.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_intelx import sfp_intelx
diff --git a/test/unit/modules/test_sfp_intfiles.py b/test/unit/modules/test_sfp_intfiles.py
index 9708b798..53d87843 100644
--- a/test/unit/modules/test_sfp_intfiles.py
+++ b/test/unit/modules/test_sfp_intfiles.py
@@ -1,5 +1,6 @@
# test_sfp_intfiles.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_intfiles import sfp_intfiles
diff --git a/test/unit/modules/test_sfp_ipinfo.py b/test/unit/modules/test_sfp_ipinfo.py
index 8cef4d0e..a982d05f 100644
--- a/test/unit/modules/test_sfp_ipinfo.py
+++ b/test/unit/modules/test_sfp_ipinfo.py
@@ -1,5 +1,6 @@
# test_sfp_ipinfo.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_ipinfo import sfp_ipinfo
diff --git a/test/unit/modules/test_sfp_ipstack.py b/test/unit/modules/test_sfp_ipstack.py
index a1210400..0828e04f 100644
--- a/test/unit/modules/test_sfp_ipstack.py
+++ b/test/unit/modules/test_sfp_ipstack.py
@@ -1,5 +1,6 @@
# test_sfp_ipstack.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_ipstack import sfp_ipstack
diff --git a/test/unit/modules/test_sfp_isc.py b/test/unit/modules/test_sfp_isc.py
index a94b9bd2..5e09f776 100644
--- a/test/unit/modules/test_sfp_isc.py
+++ b/test/unit/modules/test_sfp_isc.py
@@ -1,5 +1,6 @@
# test_sfp_isc.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_isc import sfp_isc
diff --git a/test/unit/modules/test_sfp_jsonwhoiscom.py b/test/unit/modules/test_sfp_jsonwhoiscom.py
index 3ad2f301..6b08c2ae 100644
--- a/test/unit/modules/test_sfp_jsonwhoiscom.py
+++ b/test/unit/modules/test_sfp_jsonwhoiscom.py
@@ -1,5 +1,6 @@
# test_sfp_jsonwhoiscom.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_jsonwhoiscom import sfp_jsonwhoiscom
diff --git a/test/unit/modules/test_sfp_junkfiles.py b/test/unit/modules/test_sfp_junkfiles.py
index 058cec58..2a53be03 100644
--- a/test/unit/modules/test_sfp_junkfiles.py
+++ b/test/unit/modules/test_sfp_junkfiles.py
@@ -1,5 +1,6 @@
# test_sfp_junkfiles.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_junkfiles import sfp_junkfiles
diff --git a/test/unit/modules/test_sfp_keybase.py b/test/unit/modules/test_sfp_keybase.py
index f3f13311..5efc7eda 100644
--- a/test/unit/modules/test_sfp_keybase.py
+++ b/test/unit/modules/test_sfp_keybase.py
@@ -1,5 +1,6 @@
# test_sfp_keybase.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_keybase import sfp_keybase
diff --git a/test/unit/modules/test_sfp_leakix.py b/test/unit/modules/test_sfp_leakix.py
index 52dff0fd..61b271f5 100644
--- a/test/unit/modules/test_sfp_leakix.py
+++ b/test/unit/modules/test_sfp_leakix.py
@@ -1,5 +1,6 @@
# test_sfp_leakix.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_leakix import sfp_leakix
diff --git a/test/unit/modules/test_sfp_maltiverse.py b/test/unit/modules/test_sfp_maltiverse.py
index 20b35174..be426d1c 100644
--- a/test/unit/modules/test_sfp_maltiverse.py
+++ b/test/unit/modules/test_sfp_maltiverse.py
@@ -1,5 +1,6 @@
# test_sfp_maltiverse.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_maltiverse import sfp_maltiverse
diff --git a/test/unit/modules/test_sfp_malwaredomainlist.py b/test/unit/modules/test_sfp_malwaredomainlist.py
index 451e188c..b3d15be4 100644
--- a/test/unit/modules/test_sfp_malwaredomainlist.py
+++ b/test/unit/modules/test_sfp_malwaredomainlist.py
@@ -1,5 +1,6 @@
# test_sfp_malwaredomainlist.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_malwaredomainlist import sfp_malwaredomainlist
diff --git a/test/unit/modules/test_sfp_malwaredomains.py b/test/unit/modules/test_sfp_malwaredomains.py
index a3c63d37..d6fa8d78 100644
--- a/test/unit/modules/test_sfp_malwaredomains.py
+++ b/test/unit/modules/test_sfp_malwaredomains.py
@@ -1,5 +1,6 @@
# test_sfp_malwaredomains.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_malwaredomains import sfp_malwaredomains
diff --git a/test/unit/modules/test_sfp_malwarepatrol.py b/test/unit/modules/test_sfp_malwarepatrol.py
index de7008b9..6037a0f9 100644
--- a/test/unit/modules/test_sfp_malwarepatrol.py
+++ b/test/unit/modules/test_sfp_malwarepatrol.py
@@ -1,5 +1,6 @@
# test_sfp_malwarepatrol.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_malwarepatrol import sfp_malwarepatrol
diff --git a/test/unit/modules/test_sfp_metadefender.py b/test/unit/modules/test_sfp_metadefender.py
index b1f363c6..518497e6 100644
--- a/test/unit/modules/test_sfp_metadefender.py
+++ b/test/unit/modules/test_sfp_metadefender.py
@@ -1,5 +1,6 @@
# test_sfp_metadefender.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_metadefender import sfp_metadefender
diff --git a/test/unit/modules/test_sfp_mnemonic.py b/test/unit/modules/test_sfp_mnemonic.py
index bb650d08..3ac46fd3 100644
--- a/test/unit/modules/test_sfp_mnemonic.py
+++ b/test/unit/modules/test_sfp_mnemonic.py
@@ -1,5 +1,6 @@
# test_sfp_mnemonic.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_mnemonic import sfp_mnemonic
diff --git a/test/unit/modules/test_sfp_multiproxy.py b/test/unit/modules/test_sfp_multiproxy.py
index 7a8c4b33..9a5fcd0e 100644
--- a/test/unit/modules/test_sfp_multiproxy.py
+++ b/test/unit/modules/test_sfp_multiproxy.py
@@ -1,5 +1,6 @@
# test_sfp_multiproxy.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_multiproxy import sfp_multiproxy
diff --git a/test/unit/modules/test_sfp_myspace.py b/test/unit/modules/test_sfp_myspace.py
index 4d501395..6caa73eb 100644
--- a/test/unit/modules/test_sfp_myspace.py
+++ b/test/unit/modules/test_sfp_myspace.py
@@ -1,5 +1,6 @@
# test_sfp_myspace.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_myspace import sfp_myspace
diff --git a/test/unit/modules/test_sfp_names.py b/test/unit/modules/test_sfp_names.py
index 2bc85e72..a568b454 100644
--- a/test/unit/modules/test_sfp_names.py
+++ b/test/unit/modules/test_sfp_names.py
@@ -1,5 +1,6 @@
# test_sfp_names.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_names import sfp_names
diff --git a/test/unit/modules/test_sfp_networksdb.py b/test/unit/modules/test_sfp_networksdb.py
index 0850d9d8..da657820 100644
--- a/test/unit/modules/test_sfp_networksdb.py
+++ b/test/unit/modules/test_sfp_networksdb.py
@@ -1,5 +1,6 @@
# test_sfp_networksdb.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_networksdb import sfp_networksdb
diff --git a/test/unit/modules/test_sfp_neutrinoapi.py b/test/unit/modules/test_sfp_neutrinoapi.py
index 7672f6da..9adcd9a0 100644
--- a/test/unit/modules/test_sfp_neutrinoapi.py
+++ b/test/unit/modules/test_sfp_neutrinoapi.py
@@ -1,5 +1,6 @@
# test_sfp_neutrinoapi.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_neutrinoapi import sfp_neutrinoapi
diff --git a/test/unit/modules/test_sfp_norton.py b/test/unit/modules/test_sfp_norton.py
index 6ffad6b3..f9018f6f 100644
--- a/test/unit/modules/test_sfp_norton.py
+++ b/test/unit/modules/test_sfp_norton.py
@@ -1,5 +1,6 @@
# test_sfp_norton.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_norton import sfp_norton
diff --git a/test/unit/modules/test_sfp_numverify.py b/test/unit/modules/test_sfp_numverify.py
index 69cd13b0..34e3ad0b 100644
--- a/test/unit/modules/test_sfp_numverify.py
+++ b/test/unit/modules/test_sfp_numverify.py
@@ -1,5 +1,6 @@
# test_sfp_numverify.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_numverify import sfp_numverify
diff --git a/test/unit/modules/test_sfp_onioncity.py b/test/unit/modules/test_sfp_onioncity.py
index 08a090ed..35bd1d29 100644
--- a/test/unit/modules/test_sfp_onioncity.py
+++ b/test/unit/modules/test_sfp_onioncity.py
@@ -1,5 +1,6 @@
# test_sfp_onioncity.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_onioncity import sfp_onioncity
diff --git a/test/unit/modules/test_sfp_onionsearchengine.py b/test/unit/modules/test_sfp_onionsearchengine.py
index 552b184b..4cbb201a 100644
--- a/test/unit/modules/test_sfp_onionsearchengine.py
+++ b/test/unit/modules/test_sfp_onionsearchengine.py
@@ -1,5 +1,6 @@
# test_sfp_onionsearchengine.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_onionsearchengine import sfp_onionsearchengine
diff --git a/test/unit/modules/test_sfp_onyphe.py b/test/unit/modules/test_sfp_onyphe.py
index a4bbd408..d7f85877 100644
--- a/test/unit/modules/test_sfp_onyphe.py
+++ b/test/unit/modules/test_sfp_onyphe.py
@@ -1,5 +1,6 @@
# test_sfp_onyphe.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_onyphe import sfp_onyphe
diff --git a/test/unit/modules/test_sfp_open_passive_dns_database.py b/test/unit/modules/test_sfp_open_passive_dns_database.py
index 6a2d3162..0c5a71f7 100644
--- a/test/unit/modules/test_sfp_open_passive_dns_database.py
+++ b/test/unit/modules/test_sfp_open_passive_dns_database.py
@@ -1,5 +1,6 @@
# test_sfp_open_passive_dns_database.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_open_passive_dns_database import sfp_open_passive_dns_database
diff --git a/test/unit/modules/test_sfp_openbugbounty.py b/test/unit/modules/test_sfp_openbugbounty.py
index ae41440c..105ed11e 100644
--- a/test/unit/modules/test_sfp_openbugbounty.py
+++ b/test/unit/modules/test_sfp_openbugbounty.py
@@ -1,5 +1,6 @@
# test_sfp_openbugbounty.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_openbugbounty import sfp_openbugbounty
diff --git a/test/unit/modules/test_sfp_opencorporates.py b/test/unit/modules/test_sfp_opencorporates.py
index a445f86b..4fb6ca9d 100644
--- a/test/unit/modules/test_sfp_opencorporates.py
+++ b/test/unit/modules/test_sfp_opencorporates.py
@@ -1,5 +1,6 @@
# test_sfp_opencorporates.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_opencorporates import sfp_opencorporates
diff --git a/test/unit/modules/test_sfp_opendns.py b/test/unit/modules/test_sfp_opendns.py
index 26d06017..96cf00d9 100644
--- a/test/unit/modules/test_sfp_opendns.py
+++ b/test/unit/modules/test_sfp_opendns.py
@@ -1,5 +1,6 @@
# test_sfp_opendns.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_opendns import sfp_opendns
diff --git a/test/unit/modules/test_sfp_openphish.py b/test/unit/modules/test_sfp_openphish.py
index 42f48e8f..f2346599 100644
--- a/test/unit/modules/test_sfp_openphish.py
+++ b/test/unit/modules/test_sfp_openphish.py
@@ -1,5 +1,6 @@
# test_sfp_openphish.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_openphish import sfp_openphish
diff --git a/test/unit/modules/test_sfp_openstreetmap.py b/test/unit/modules/test_sfp_openstreetmap.py
index fd3ec2bd..c53bcb10 100644
--- a/test/unit/modules/test_sfp_openstreetmap.py
+++ b/test/unit/modules/test_sfp_openstreetmap.py
@@ -1,5 +1,6 @@
# test_sfp_openstreetmap.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_openstreetmap import sfp_openstreetmap
diff --git a/test/unit/modules/test_sfp_pageinfo.py b/test/unit/modules/test_sfp_pageinfo.py
index eb58f7a6..3a91a20c 100644
--- a/test/unit/modules/test_sfp_pageinfo.py
+++ b/test/unit/modules/test_sfp_pageinfo.py
@@ -1,5 +1,6 @@
# test_sfp_pageinfo.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_pageinfo import sfp_pageinfo
diff --git a/test/unit/modules/test_sfp_pastebin.py b/test/unit/modules/test_sfp_pastebin.py
index 34e10540..ad8d042f 100644
--- a/test/unit/modules/test_sfp_pastebin.py
+++ b/test/unit/modules/test_sfp_pastebin.py
@@ -1,5 +1,6 @@
# test_sfp_pastebin.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_pastebin import sfp_pastebin
diff --git a/test/unit/modules/test_sfp_pgp.py b/test/unit/modules/test_sfp_pgp.py
index 38f23fa7..14ba73ca 100644
--- a/test/unit/modules/test_sfp_pgp.py
+++ b/test/unit/modules/test_sfp_pgp.py
@@ -1,5 +1,6 @@
# test_sfp_pgp.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_pgp import sfp_pgp
diff --git a/test/unit/modules/test_sfp_phishstats.py b/test/unit/modules/test_sfp_phishstats.py
index 45ee393b..021f7e48 100644
--- a/test/unit/modules/test_sfp_phishstats.py
+++ b/test/unit/modules/test_sfp_phishstats.py
@@ -1,5 +1,6 @@
# test_sfp_phishstats.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_phishstats import sfp_phishstats
diff --git a/test/unit/modules/test_sfp_phishtank.py b/test/unit/modules/test_sfp_phishtank.py
index b56df61a..4bbc7e44 100644
--- a/test/unit/modules/test_sfp_phishtank.py
+++ b/test/unit/modules/test_sfp_phishtank.py
@@ -1,5 +1,6 @@
# test_sfp_phishtank.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_phishtank import sfp_phishtank
diff --git a/test/unit/modules/test_sfp_phone.py b/test/unit/modules/test_sfp_phone.py
index c1d63f02..a6bad8f6 100644
--- a/test/unit/modules/test_sfp_phone.py
+++ b/test/unit/modules/test_sfp_phone.py
@@ -1,5 +1,6 @@
# test_sfp_phone.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_phone import sfp_phone
diff --git a/test/unit/modules/test_sfp_portscan_tcp.py b/test/unit/modules/test_sfp_portscan_tcp.py
index 5fa9cc29..73537805 100644
--- a/test/unit/modules/test_sfp_portscan_tcp.py
+++ b/test/unit/modules/test_sfp_portscan_tcp.py
@@ -1,5 +1,6 @@
# test_sfp_portscan_tcp.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_portscan_tcp import sfp_portscan_tcp
diff --git a/test/unit/modules/test_sfp_psbdmp.py b/test/unit/modules/test_sfp_psbdmp.py
index 76e7f1c4..d82b2aeb 100644
--- a/test/unit/modules/test_sfp_psbdmp.py
+++ b/test/unit/modules/test_sfp_psbdmp.py
@@ -1,5 +1,6 @@
# test_sfp_psbdmp.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_psbdmp import sfp_psbdmp
diff --git a/test/unit/modules/test_sfp_pulsedive.py b/test/unit/modules/test_sfp_pulsedive.py
index 2d0d43ca..01bf9f46 100644
--- a/test/unit/modules/test_sfp_pulsedive.py
+++ b/test/unit/modules/test_sfp_pulsedive.py
@@ -1,5 +1,6 @@
# test_sfp_pulsedive.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_pulsedive import sfp_pulsedive
diff --git a/test/unit/modules/test_sfp_quad9.py b/test/unit/modules/test_sfp_quad9.py
index 529cef77..28bc1afe 100644
--- a/test/unit/modules/test_sfp_quad9.py
+++ b/test/unit/modules/test_sfp_quad9.py
@@ -1,5 +1,6 @@
# test_sfp_quad9.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_quad9 import sfp_quad9
diff --git a/test/unit/modules/test_sfp_ripe.py b/test/unit/modules/test_sfp_ripe.py
index 39179b19..d05312fd 100644
--- a/test/unit/modules/test_sfp_ripe.py
+++ b/test/unit/modules/test_sfp_ripe.py
@@ -1,5 +1,6 @@
# test_sfp_ripe.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_ripe import sfp_ripe
diff --git a/test/unit/modules/test_sfp_riskiq.py b/test/unit/modules/test_sfp_riskiq.py
index 183e4269..2c326bb4 100644
--- a/test/unit/modules/test_sfp_riskiq.py
+++ b/test/unit/modules/test_sfp_riskiq.py
@@ -1,5 +1,6 @@
# test_sfp_riskiq.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_riskiq import sfp_riskiq
diff --git a/test/unit/modules/test_sfp_robtex.py b/test/unit/modules/test_sfp_robtex.py
index 72178a63..d6c629cb 100644
--- a/test/unit/modules/test_sfp_robtex.py
+++ b/test/unit/modules/test_sfp_robtex.py
@@ -1,5 +1,6 @@
# test_sfp_robtex.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_robtex import sfp_robtex
diff --git a/test/unit/modules/test_sfp_s3bucket.py b/test/unit/modules/test_sfp_s3bucket.py
index 2e16c445..23579951 100644
--- a/test/unit/modules/test_sfp_s3bucket.py
+++ b/test/unit/modules/test_sfp_s3bucket.py
@@ -1,5 +1,6 @@
# test_sfp_s3bucket.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_s3bucket import sfp_s3bucket
diff --git a/test/unit/modules/test_sfp_scylla.py b/test/unit/modules/test_sfp_scylla.py
index fd6d87c7..f68923dd 100644
--- a/test/unit/modules/test_sfp_scylla.py
+++ b/test/unit/modules/test_sfp_scylla.py
@@ -1,5 +1,6 @@
# test_sfp_scylla.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_scylla import sfp_scylla
diff --git a/test/unit/modules/test_sfp_securitytrails.py b/test/unit/modules/test_sfp_securitytrails.py
index 8e644a4c..dace3c59 100644
--- a/test/unit/modules/test_sfp_securitytrails.py
+++ b/test/unit/modules/test_sfp_securitytrails.py
@@ -1,5 +1,6 @@
# test_sfp_securitytrails.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_securitytrails import sfp_securitytrails
diff --git a/test/unit/modules/test_sfp_shodan.py b/test/unit/modules/test_sfp_shodan.py
index 4e30a5e5..c61eac81 100644
--- a/test/unit/modules/test_sfp_shodan.py
+++ b/test/unit/modules/test_sfp_shodan.py
@@ -1,5 +1,6 @@
# test_sfp_shodan.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_shodan import sfp_shodan
diff --git a/test/unit/modules/test_sfp_similar.py b/test/unit/modules/test_sfp_similar.py
index 28e6bbc8..20f24652 100644
--- a/test/unit/modules/test_sfp_similar.py
+++ b/test/unit/modules/test_sfp_similar.py
@@ -1,5 +1,6 @@
# test_sfp_similar.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_similar import sfp_similar
diff --git a/test/unit/modules/test_sfp_skymem.py b/test/unit/modules/test_sfp_skymem.py
index 6d90171a..90f4f136 100644
--- a/test/unit/modules/test_sfp_skymem.py
+++ b/test/unit/modules/test_sfp_skymem.py
@@ -1,5 +1,6 @@
# test_sfp_skymem.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_skymem import sfp_skymem
diff --git a/test/unit/modules/test_sfp_slideshare.py b/test/unit/modules/test_sfp_slideshare.py
index b9b6bea2..119dd536 100644
--- a/test/unit/modules/test_sfp_slideshare.py
+++ b/test/unit/modules/test_sfp_slideshare.py
@@ -1,5 +1,6 @@
# test_sfp_slideshare.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_slideshare import sfp_slideshare
diff --git a/test/unit/modules/test_sfp_snov.py b/test/unit/modules/test_sfp_snov.py
index 4f418116..bf0daa2a 100644
--- a/test/unit/modules/test_sfp_snov.py
+++ b/test/unit/modules/test_sfp_snov.py
@@ -1,5 +1,6 @@
# test_sfp_snov.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_snov import sfp_snov
diff --git a/test/unit/modules/test_sfp_social.py b/test/unit/modules/test_sfp_social.py
index fa3d2f06..f5860c54 100644
--- a/test/unit/modules/test_sfp_social.py
+++ b/test/unit/modules/test_sfp_social.py
@@ -1,5 +1,6 @@
# test_sfp_social.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_social import sfp_social
diff --git a/test/unit/modules/test_sfp_socialprofiles.py b/test/unit/modules/test_sfp_socialprofiles.py
index b696cec7..e477916e 100644
--- a/test/unit/modules/test_sfp_socialprofiles.py
+++ b/test/unit/modules/test_sfp_socialprofiles.py
@@ -1,5 +1,6 @@
# test_sfp_socialprofiles.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_socialprofiles import sfp_socialprofiles
diff --git a/test/unit/modules/test_sfp_sorbs.py b/test/unit/modules/test_sfp_sorbs.py
index 8fc7b6d4..8e3e522c 100644
--- a/test/unit/modules/test_sfp_sorbs.py
+++ b/test/unit/modules/test_sfp_sorbs.py
@@ -1,5 +1,6 @@
# test_sfp_sorbs.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_sorbs import sfp_sorbs
diff --git a/test/unit/modules/test_sfp_spamcop.py b/test/unit/modules/test_sfp_spamcop.py
index 47335491..3764f7dc 100644
--- a/test/unit/modules/test_sfp_spamcop.py
+++ b/test/unit/modules/test_sfp_spamcop.py
@@ -1,5 +1,6 @@
# test_sfp_spamcop.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_spamcop import sfp_spamcop
diff --git a/test/unit/modules/test_sfp_spamhaus.py b/test/unit/modules/test_sfp_spamhaus.py
index e8837541..eba4ab14 100644
--- a/test/unit/modules/test_sfp_spamhaus.py
+++ b/test/unit/modules/test_sfp_spamhaus.py
@@ -1,5 +1,6 @@
# test_sfp_spamhaus.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_spamhaus import sfp_spamhaus
diff --git a/test/unit/modules/test_sfp_spider.py b/test/unit/modules/test_sfp_spider.py
index 7026fbfe..a46e5a4a 100644
--- a/test/unit/modules/test_sfp_spider.py
+++ b/test/unit/modules/test_sfp_spider.py
@@ -1,5 +1,6 @@
# test_sfp_spider.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_spider import sfp_spider
diff --git a/test/unit/modules/test_sfp_spur.py b/test/unit/modules/test_sfp_spur.py
index ee9031b5..2e9f606e 100644
--- a/test/unit/modules/test_sfp_spur.py
+++ b/test/unit/modules/test_sfp_spur.py
@@ -1,5 +1,6 @@
# test_sfp_spur.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_spur import sfp_spur
diff --git a/test/unit/modules/test_sfp_spyonweb.py b/test/unit/modules/test_sfp_spyonweb.py
index 7e2dc12d..8faac75e 100644
--- a/test/unit/modules/test_sfp_spyonweb.py
+++ b/test/unit/modules/test_sfp_spyonweb.py
@@ -1,5 +1,6 @@
# test_sfp_spyonweb.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_spyonweb import sfp_spyonweb
diff --git a/test/unit/modules/test_sfp_spyse.py b/test/unit/modules/test_sfp_spyse.py
index 5017a22c..f257a78c 100644
--- a/test/unit/modules/test_sfp_spyse.py
+++ b/test/unit/modules/test_sfp_spyse.py
@@ -1,5 +1,6 @@
# test_sfp_spyse.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_spyse import sfp_spyse
diff --git a/test/unit/modules/test_sfp_sslcert.py b/test/unit/modules/test_sfp_sslcert.py
index db907088..45e8392d 100644
--- a/test/unit/modules/test_sfp_sslcert.py
+++ b/test/unit/modules/test_sfp_sslcert.py
@@ -1,5 +1,6 @@
# test_sfp_sslcert.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_sslcert import sfp_sslcert
diff --git a/test/unit/modules/test_sfp_strangeheaders.py b/test/unit/modules/test_sfp_strangeheaders.py
index deaf44df..2b6f1b8a 100644
--- a/test/unit/modules/test_sfp_strangeheaders.py
+++ b/test/unit/modules/test_sfp_strangeheaders.py
@@ -1,5 +1,6 @@
# test_sfp_strangeheaders.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_strangeheaders import sfp_strangeheaders
diff --git a/test/unit/modules/test_sfp_subdomain_takeover.py b/test/unit/modules/test_sfp_subdomain_takeover.py
index 5b72b046..63432ef4 100644
--- a/test/unit/modules/test_sfp_subdomain_takeover.py
+++ b/test/unit/modules/test_sfp_subdomain_takeover.py
@@ -1,5 +1,6 @@
# test_sfp_subdomain_takeover.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_subdomain_takeover import sfp_subdomain_takeover
diff --git a/test/unit/modules/test_sfp_talosintel.py b/test/unit/modules/test_sfp_talosintel.py
index e0811a19..55ad13b2 100644
--- a/test/unit/modules/test_sfp_talosintel.py
+++ b/test/unit/modules/test_sfp_talosintel.py
@@ -1,5 +1,6 @@
# test_sfp_talosintel.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_talosintel import sfp_talosintel
diff --git a/test/unit/modules/test_sfp_template.py b/test/unit/modules/test_sfp_template.py
index eb5e81cd..c0026727 100644
--- a/test/unit/modules/test_sfp_template.py
+++ b/test/unit/modules/test_sfp_template.py
@@ -1,5 +1,6 @@
# test_sfp_template.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_template import sfp_template
diff --git a/test/unit/modules/test_sfp_threatcrowd.py b/test/unit/modules/test_sfp_threatcrowd.py
index c2401a17..e7900416 100644
--- a/test/unit/modules/test_sfp_threatcrowd.py
+++ b/test/unit/modules/test_sfp_threatcrowd.py
@@ -1,5 +1,6 @@
# test_sfp_threatcrowd.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_threatcrowd import sfp_threatcrowd
diff --git a/test/unit/modules/test_sfp_threatminer.py b/test/unit/modules/test_sfp_threatminer.py
index 0427e1c9..f44f81f4 100644
--- a/test/unit/modules/test_sfp_threatminer.py
+++ b/test/unit/modules/test_sfp_threatminer.py
@@ -1,5 +1,6 @@
# test_sfp_threatminer.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_threatminer import sfp_threatminer
diff --git a/test/unit/modules/test_sfp_tldsearch.py b/test/unit/modules/test_sfp_tldsearch.py
index 2838ba61..2324179d 100644
--- a/test/unit/modules/test_sfp_tldsearch.py
+++ b/test/unit/modules/test_sfp_tldsearch.py
@@ -1,5 +1,6 @@
# test_sfp_tldsearch.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_tldsearch import sfp_tldsearch
diff --git a/test/unit/modules/test_sfp_tool_cmseek.py b/test/unit/modules/test_sfp_tool_cmseek.py
index b07733a9..ddabf8ab 100644
--- a/test/unit/modules/test_sfp_tool_cmseek.py
+++ b/test/unit/modules/test_sfp_tool_cmseek.py
@@ -1,5 +1,6 @@
# test_sfp_tool_cmseek.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_tool_cmseek import sfp_tool_cmseek
diff --git a/test/unit/modules/test_sfp_tool_dnstwist.py b/test/unit/modules/test_sfp_tool_dnstwist.py
index 1166e7cd..8681ad5b 100644
--- a/test/unit/modules/test_sfp_tool_dnstwist.py
+++ b/test/unit/modules/test_sfp_tool_dnstwist.py
@@ -1,5 +1,6 @@
# test_sfp_tool_dnstwist.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_tool_dnstwist import sfp_tool_dnstwist
diff --git a/test/unit/modules/test_sfp_tool_nmap.py b/test/unit/modules/test_sfp_tool_nmap.py
index b462c46c..9bc66d7d 100644
--- a/test/unit/modules/test_sfp_tool_nmap.py
+++ b/test/unit/modules/test_sfp_tool_nmap.py
@@ -1,5 +1,6 @@
# test_sfp_tool_nmap.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_tool_nmap import sfp_tool_nmap
diff --git a/test/unit/modules/test_sfp_tool_whatweb.py b/test/unit/modules/test_sfp_tool_whatweb.py
index 856b3644..e3d0a91d 100644
--- a/test/unit/modules/test_sfp_tool_whatweb.py
+++ b/test/unit/modules/test_sfp_tool_whatweb.py
@@ -1,5 +1,6 @@
# test_sfp_tool_whatweb.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_tool_whatweb import sfp_tool_whatweb
diff --git a/test/unit/modules/test_sfp_torch.py b/test/unit/modules/test_sfp_torch.py
index 2f6ceb89..973bbe75 100644
--- a/test/unit/modules/test_sfp_torch.py
+++ b/test/unit/modules/test_sfp_torch.py
@@ -1,5 +1,6 @@
# test_sfp_torch.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_torch import sfp_torch
diff --git a/test/unit/modules/test_sfp_torexits.py b/test/unit/modules/test_sfp_torexits.py
index 32eca26a..067f934c 100644
--- a/test/unit/modules/test_sfp_torexits.py
+++ b/test/unit/modules/test_sfp_torexits.py
@@ -1,5 +1,6 @@
# test_sfp_torexits.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_torexits import sfp_torexits
diff --git a/test/unit/modules/test_sfp_totalhash.py b/test/unit/modules/test_sfp_totalhash.py
index a90aab72..b947d357 100644
--- a/test/unit/modules/test_sfp_totalhash.py
+++ b/test/unit/modules/test_sfp_totalhash.py
@@ -1,5 +1,6 @@
# test_sfp_totalhash.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_totalhash import sfp_totalhash
diff --git a/test/unit/modules/test_sfp_twilio.py b/test/unit/modules/test_sfp_twilio.py
index 0805e37e..f4b04275 100644
--- a/test/unit/modules/test_sfp_twilio.py
+++ b/test/unit/modules/test_sfp_twilio.py
@@ -1,5 +1,6 @@
# test_sfp_twilio.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_twilio import sfp_twilio
diff --git a/test/unit/modules/test_sfp_twitter.py b/test/unit/modules/test_sfp_twitter.py
index a18180ad..4b76b7b1 100644
--- a/test/unit/modules/test_sfp_twitter.py
+++ b/test/unit/modules/test_sfp_twitter.py
@@ -1,5 +1,6 @@
# test_sfp_twitter.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_twitter import sfp_twitter
diff --git a/test/unit/modules/test_sfp_uceprotect.py b/test/unit/modules/test_sfp_uceprotect.py
index bfdb07d1..bc797cc0 100644
--- a/test/unit/modules/test_sfp_uceprotect.py
+++ b/test/unit/modules/test_sfp_uceprotect.py
@@ -1,5 +1,6 @@
# test_sfp_uceprotect.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_uceprotect import sfp_uceprotect
diff --git a/test/unit/modules/test_sfp_urlscan.py b/test/unit/modules/test_sfp_urlscan.py
index 12f84a82..576078b2 100644
--- a/test/unit/modules/test_sfp_urlscan.py
+++ b/test/unit/modules/test_sfp_urlscan.py
@@ -1,5 +1,6 @@
# test_sfp_urlscan.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_urlscan import sfp_urlscan
diff --git a/test/unit/modules/test_sfp_venmo.py b/test/unit/modules/test_sfp_venmo.py
index 2e23141a..844526aa 100644
--- a/test/unit/modules/test_sfp_venmo.py
+++ b/test/unit/modules/test_sfp_venmo.py
@@ -1,5 +1,6 @@
# test_sfp_venmo.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_venmo import sfp_venmo
diff --git a/test/unit/modules/test_sfp_viewdns.py b/test/unit/modules/test_sfp_viewdns.py
index 4700e2dc..b9b104ce 100644
--- a/test/unit/modules/test_sfp_viewdns.py
+++ b/test/unit/modules/test_sfp_viewdns.py
@@ -1,5 +1,6 @@
# test_sfp_viewdns.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_viewdns import sfp_viewdns
diff --git a/test/unit/modules/test_sfp_virustotal.py b/test/unit/modules/test_sfp_virustotal.py
index 966126ea..e6773ee1 100644
--- a/test/unit/modules/test_sfp_virustotal.py
+++ b/test/unit/modules/test_sfp_virustotal.py
@@ -1,5 +1,6 @@
# test_sfp_virustotal.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_virustotal import sfp_virustotal
diff --git a/test/unit/modules/test_sfp_voipbl.py b/test/unit/modules/test_sfp_voipbl.py
index 8c00ae3d..62aa8e50 100644
--- a/test/unit/modules/test_sfp_voipbl.py
+++ b/test/unit/modules/test_sfp_voipbl.py
@@ -1,5 +1,6 @@
# test_sfp_voipbl.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_voipbl import sfp_voipbl
diff --git a/test/unit/modules/test_sfp_vxvault.py b/test/unit/modules/test_sfp_vxvault.py
index 877df198..c862c26f 100644
--- a/test/unit/modules/test_sfp_vxvault.py
+++ b/test/unit/modules/test_sfp_vxvault.py
@@ -1,5 +1,6 @@
# test_sfp_vxvault.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_vxvault import sfp_vxvault
diff --git a/test/unit/modules/test_sfp_watchguard.py b/test/unit/modules/test_sfp_watchguard.py
index 10a85486..ba7848f3 100644
--- a/test/unit/modules/test_sfp_watchguard.py
+++ b/test/unit/modules/test_sfp_watchguard.py
@@ -1,5 +1,6 @@
# test_sfp_watchguard.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_watchguard import sfp_watchguard
diff --git a/test/unit/modules/test_sfp_webanalytics.py b/test/unit/modules/test_sfp_webanalytics.py
index 10857bf0..e9db3f08 100644
--- a/test/unit/modules/test_sfp_webanalytics.py
+++ b/test/unit/modules/test_sfp_webanalytics.py
@@ -1,5 +1,6 @@
# test_sfp_webanalytics.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_webanalytics import sfp_webanalytics
diff --git a/test/unit/modules/test_sfp_webframework.py b/test/unit/modules/test_sfp_webframework.py
index ffc34a16..7f092b24 100644
--- a/test/unit/modules/test_sfp_webframework.py
+++ b/test/unit/modules/test_sfp_webframework.py
@@ -1,5 +1,6 @@
# test sfp_webframework.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_webframework import sfp_webframework
diff --git a/test/unit/modules/test_sfp_webserver.py b/test/unit/modules/test_sfp_webserver.py
index f858a66b..8616a14c 100644
--- a/test/unit/modules/test_sfp_webserver.py
+++ b/test/unit/modules/test_sfp_webserver.py
@@ -1,5 +1,6 @@
# test_sfp_webserver.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_webserver import sfp_webserver
diff --git a/test/unit/modules/test_sfp_whatcms.py b/test/unit/modules/test_sfp_whatcms.py
index 725bb4a6..8e0e910c 100644
--- a/test/unit/modules/test_sfp_whatcms.py
+++ b/test/unit/modules/test_sfp_whatcms.py
@@ -1,5 +1,6 @@
# test_sfp_whatcms.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_whatcms import sfp_whatcms
diff --git a/test/unit/modules/test_sfp_whois.py b/test/unit/modules/test_sfp_whois.py
index 37d40c3a..50657e36 100644
--- a/test/unit/modules/test_sfp_whois.py
+++ b/test/unit/modules/test_sfp_whois.py
@@ -1,5 +1,6 @@
# test_sfp_whois.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_whois import sfp_whois
diff --git a/test/unit/modules/test_sfp_whoisology.py b/test/unit/modules/test_sfp_whoisology.py
index f1aae85a..72bc686d 100644
--- a/test/unit/modules/test_sfp_whoisology.py
+++ b/test/unit/modules/test_sfp_whoisology.py
@@ -1,5 +1,6 @@
# test_sfp_whoisology.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_whoisology import sfp_whoisology
diff --git a/test/unit/modules/test_sfp_whoxy.py b/test/unit/modules/test_sfp_whoxy.py
index 69e01e7b..cf39e905 100644
--- a/test/unit/modules/test_sfp_whoxy.py
+++ b/test/unit/modules/test_sfp_whoxy.py
@@ -1,5 +1,6 @@
# test_sfp_whoxy.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_whoxy import sfp_whoxy
diff --git a/test/unit/modules/test_sfp_wigle.py b/test/unit/modules/test_sfp_wigle.py
index 18aedd9b..a66e6466 100644
--- a/test/unit/modules/test_sfp_wigle.py
+++ b/test/unit/modules/test_sfp_wigle.py
@@ -1,5 +1,6 @@
# test_sfp_wigle.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_wigle import sfp_wigle
diff --git a/test/unit/modules/test_sfp_wikileaks.py b/test/unit/modules/test_sfp_wikileaks.py
index 59b02c29..dd30fcd0 100644
--- a/test/unit/modules/test_sfp_wikileaks.py
+++ b/test/unit/modules/test_sfp_wikileaks.py
@@ -1,5 +1,6 @@
# test_sfp_wikileaks.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_wikileaks import sfp_wikileaks
diff --git a/test/unit/modules/test_sfp_wikipediaedits.py b/test/unit/modules/test_sfp_wikipediaedits.py
index 92233f40..2bd31060 100644
--- a/test/unit/modules/test_sfp_wikipediaedits.py
+++ b/test/unit/modules/test_sfp_wikipediaedits.py
@@ -1,5 +1,6 @@
# test_sfp_wikipediaedits.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_wikipediaedits import sfp_wikipediaedits
diff --git a/test/unit/modules/test_sfp_xforce.py b/test/unit/modules/test_sfp_xforce.py
index a586c9ea..2ef2ea55 100644
--- a/test/unit/modules/test_sfp_xforce.py
+++ b/test/unit/modules/test_sfp_xforce.py
@@ -1,5 +1,6 @@
# test_sfp_xforce.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_xforce import sfp_xforce
diff --git a/test/unit/modules/test_sfp_yandexdns.py b/test/unit/modules/test_sfp_yandexdns.py
index f18649a1..cf4cfb38 100644
--- a/test/unit/modules/test_sfp_yandexdns.py
+++ b/test/unit/modules/test_sfp_yandexdns.py
@@ -1,5 +1,6 @@
# test_sfp_yandexdns.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_yandexdns import sfp_yandexdns
diff --git a/test/unit/modules/test_sfp_zoneh.py b/test/unit/modules/test_sfp_zoneh.py
index 47bf8376..8e426aad 100644
--- a/test/unit/modules/test_sfp_zoneh.py
+++ b/test/unit/modules/test_sfp_zoneh.py
@@ -1,5 +1,6 @@
# test_sfp_zoneh.py
-from sflib import SpiderFoot, SpiderFootEvent, SpiderFootTarget
+from sflib import SpiderFoot, SpiderFootEvent
+from spiderfoot import SpiderFootTarget
import unittest
from modules.sfp_zoneh import sfp_zoneh