@@ -736,7 +736,7 @@ def singleTimeLogMessage(message, level=logging.INFO, flag=None):
     if flag is None:
         flag = hash(message)
 
-    if flag not in kb.singleLogFlags:
+    if not conf.smokeTest and flag not in kb.singleLogFlags:
         kb.singleLogFlags.add(flag)
         logger.log(level, message)
 
 
@@ -41,8 +41,9 @@
 
 def smokeTest():
     """
-    This will run the basic smoke testing of a program
+    Runs the basic smoke testing of a program
     """
+
     retVal = True
     count, length = 0, 0
 
@@ -106,8 +107,9 @@ def adjustValueType(tagName, value):
 
 def liveTest():
     """
-    This will run the test of a program against the live testing environment
+    Runs the test of a program against the live testing environment
     """
+
     global failedItem
     global failedParseOn
     global failedTraceBack
 
@@ -16,15 +16,14 @@ def tamper(payload, **kwargs):
     """
     Replaces apostrophe character with its UTF-8 full width counterpart
 
-    Example:
-        * Input: AND '1'='1'
-        * Output: AND %EF%BC%871%EF%BC%87=%EF%BC%871%EF%BC%87
-
     References:
         * http://www.utf8-chartable.de/unicode-utf8-table.pl?start=65280&number=128
         * http://lukasz.pilorz.net/testy/unicode_conversion/
         * http://sla.ckers.org/forum/read.php?13,11562,11850
         * http://lukasz.pilorz.net/testy/full_width_utf/index.phps
+
+    >>> tamper("1 AND '1'='1")
+    '1 AND %EF%BC%871%EF%BC%87=%EF%BC%871'
     """
 
     return payload.replace('\'', "%EF%BC%87") if payload else payload
@@ -16,9 +16,8 @@ def tamper(payload, **kwargs):
     """
     Replaces apostrophe character with its illegal double unicode counterpart
 
-    Example:
-        * Input: AND '1'='1'
-        * Output: AND %00%271%00%27=%00%271%00%27
+    >>> tamper("1 AND '1'='1")
+    '1 AND %00%271%00%27=%00%271'
     """
 
     return payload.replace('\'', "%00%27") if payload else payload
@@ -16,10 +16,6 @@ def tamper(payload, **kwargs):
     """
     Appends encoded NULL byte character at the end of payload
 
-    Example:
-        * Input: AND 1=1
-        * Output: AND 1=1%00
-
     Requirement:
         * Microsoft Access
 
@@ -29,6 +25,9 @@ def tamper(payload, **kwargs):
           also possible
 
     Reference: http://projects.webappsec.org/w/page/13246949/Null-Byte-Injection
+
+    >>> tamper('1 AND 1=1')
+    '1 AND 1=1%00'
     """
 
     return "%s%%00" % payload if payload else payload
@@ -18,9 +18,8 @@ def tamper(payload, **kwargs):
     """
     Base64 all characters in a given payload
 
-    Example:
-        * Input: 1' AND SLEEP(5)#
-        * Output: MScgQU5EIFNMRUVQKDUpIw==
+    >>> tamper("1' AND SLEEP(5)#")
+    'MScgQU5EIFNMRUVQKDUpIw=='
     """
 
     return base64.b64encode(payload) if payload else payload
@@ -18,10 +18,6 @@ def tamper(payload, **kwargs):
     """
     Replaces greater than operator ('>') with 'NOT BETWEEN 0 AND #'
 
-    Example:
-        * Input: 'A > B'
-        * Output: 'A NOT BETWEEN 0 AND B'
-
     Tested against:
         * Microsoft SQL Server 2005
         * MySQL 4, 5.0 and 5.5
@@ -33,6 +29,9 @@ def tamper(payload, **kwargs):
           filter the greater than character
         * The BETWEEN clause is SQL standard. Hence, this tamper script
           should work against all (?) databases
+
+    >>> tamper('1 AND A > B--')
+    '1 AND A NOT BETWEEN 0 AND B--'
     """
 
     retVal = payload
 
@@ -19,10 +19,6 @@ def tamper(payload, **kwargs):
     Replaces space character after SQL statement with a valid random blank character.
     Afterwards replace character = with LIKE operator
 
-    Example:
-        * Input: SELECT id FROM users where id = 1
-        * Output: SELECT%09id FROM users where id LIKE 1
-
     Requirement:
         * Blue Coat SGOS with WAF activated as documented in
         https://kb.bluecoat.com/index?page=content&id=FAQ2147
@@ -32,12 +28,15 @@ def tamper(payload, **kwargs):
 
     Notes:
         * Useful to bypass Blue Coat's recommended WAF rule configuration
+
+    >>> tamper('SELECT id FROM users where id = 1')
+    'SELECT%09id FROM users where id LIKE 1'
     """
 
     retVal = payload
 
     if payload:
-        retVal = re.sub(r"(?i)(SELECT|UPDATE|INSERT|DELETE)\s+", r"\g<1>\t", payload)
+        retVal = re.sub(r"(?i)(SELECT|UPDATE|INSERT|DELETE)\s+", r"\g<1>%09", payload)
         retVal = re.sub(r"\s*=\s*", " LIKE ", retVal)
 
     return retVal
@@ -19,14 +19,13 @@ def tamper(payload, **kwargs):
     Double url-encodes all characters in a given payload (not processing
     already encoded)
 
-    Example:
-        * Input: SELECT FIELD FROM%20TABLE
-        * Output: %2553%2545%254c%2545%2543%2554%2520%2546%2549%2545%254c%2544%2520%2546%2552%254f%254d%2520%2554%2541%2542%254c%2545
-
     Notes:
         * Useful to bypass some weak web application firewalls that do not
           double url-decode the request before processing it through their
           ruleset
+
+    >>> tamper('SELECT FIELD FROM%20TABLE')
+    '%2553%2545%254C%2545%2543%2554%2520%2546%2549%2545%254C%2544%2520%2546%2552%254F%254D%2520%2554%2541%2542%254C%2545'
     """
 
     retVal = payload
@@ -37,7 +36,7 @@ def tamper(payload, **kwargs):
 
         while i < len(payload):
             if payload[i] == '%' and (i < len(payload) - 2) and payload[i + 1:i + 2] in string.hexdigits and payload[i + 2:i + 3] in string.hexdigits:
-                retVal += payload[i:i + 3]
+                retVal += '%%25%s' % payload[i + 1:i + 3]
                 i += 3
             else:
                 retVal += '%%25%.2X' % ord(payload[i])
 
@@ -19,10 +19,6 @@ def tamper(payload, **kwargs):
     Url-encodes all characters in a given payload (not processing already
     encoded)
 
-    Example:
-        * Input: SELECT FIELD FROM%20TABLE
-        * Output: %53%45%4c%45%43%54%20%46%49%45%4c%44%20%46%52%4f%4d%20%54%41%42%4c%45
-
     Tested against:
         * Microsoft SQL Server 2005
         * MySQL 4, 5.0 and 5.5
@@ -34,6 +30,9 @@ def tamper(payload, **kwargs):
           url-decode the request before processing it through their ruleset
         * The web server will anyway pass the url-decoded version behind,
           hence it should work against any DBMS
+
+    >>> tamper('SELECT FIELD FROM%20TABLE')
+    '%53%45%4C%45%43%54%20%46%49%45%4C%44%20%46%52%4F%4D%20%54%41%42%4C%45'
     """
 
     retVal = payload