diff --git a/bots/y-bot/aiml/core/datetime_convo.aiml b/bots/y-bot/aiml/core/datetime_convo.aiml
index 33920ab03..6d065678a 100644
--- a/bots/y-bot/aiml/core/datetime_convo.aiml
+++ b/bots/y-bot/aiml/core/datetime_convo.aiml
@@ -25,7 +25,7 @@
 
     <category>
         <pattern>
-            # WHAT # SEASON #
+            # THE SEASON ^
         </pattern>
         <template>
             It is <srai>SEASON</srai>
@@ -34,7 +34,7 @@
 
     <category>
         <pattern>
-            # WHICH # SEASON #
+            # WHAT # SEASON ^
         </pattern>
         <template>
             It is <srai>SEASON</srai>
@@ -43,7 +43,16 @@
 
     <category>
         <pattern>
-            # WHAT # MONTH #
+            # WHICH # SEASON ^
+        </pattern>
+        <template>
+            It is <srai>SEASON</srai>
+        </template>
+    </category>
+
+    <category>
+        <pattern>
+            # WHAT # MONTH ^
         </pattern>
         <template>
             <srai>MONTH</srai>
@@ -52,7 +61,7 @@
 
     <category>
         <pattern>
-            # WHICH # MONTH #
+            # WHICH # MONTH ^
         </pattern>
         <template>
             <srai>MONTH</srai>
@@ -61,7 +70,7 @@
 
     <category>
         <pattern>
-            # WHAT # DAY #
+            # WHAT # DAY ^
         </pattern>
         <template>
             <srai>DAY</srai>
@@ -70,7 +79,7 @@
 
     <category>
         <pattern>
-            # WHICH # DAY #
+            # WHICH # DAY ^
         </pattern>
         <template>
             <srai>DAY</srai>
@@ -88,10 +97,19 @@
 
     <category>
         <pattern>
-            # WHAT # TODAY
+            # WHAT # TODAY ^
         </pattern>
         <template>
-            <srai>TODAY</srai>
+            <srai>DAY</srai>
+        </template>
+    </category>
+
+    <category>
+        <pattern>
+            # WHICH # TODAY ^
+        </pattern>
+        <template>
+            <srai>DAY</srai>
         </template>
     </category>
 
@@ -124,7 +142,7 @@
 
     <category>
         <pattern>
-            # WHAT # YEAR #
+            # WHAT # YEAR ^
         </pattern>
         <template>
             <srai>YEAR</srai>
@@ -133,7 +151,7 @@
 
     <category>
         <pattern>
-            # WHICH # YEAR #
+            # WHICH # YEAR ^
         </pattern>
         <template>
             <srai>YEAR</srai>
@@ -142,7 +160,7 @@
 
     <category>
         <pattern>
-            # WHAT # TODAYS DATE #
+            # WHAT # TODAYS DATE ^
         </pattern>
         <template>
             <srai>DATE</srai>
@@ -151,7 +169,7 @@
 
     <category>
         <pattern>
-            # WHAT # DATE #
+            # WHAT # DATE ^
         </pattern>
         <template>
             <srai>DATE</srai>
@@ -160,7 +178,7 @@
 
     <category>
         <pattern>
-            # WHAT # TIME #
+            # WHAT # TIME ^
         </pattern>
         <template>
             <srai>TIME</srai>
diff --git a/bots/y-bot/tests/core/datetime_convo.tests b/bots/y-bot/tests/core/datetime_convo.tests
new file mode 100644
index 000000000..dea2837f5
--- /dev/null
+++ b/bots/y-bot/tests/core/datetime_convo.tests
@@ -0,0 +1,56 @@
+# THE SEASON #
+"THE SEASON", "Winter", "Spring", "Summer", "Autumn", "Fall"
+"TELL ME THE SEASON", "Winter", "Spring", "Summer", "Autumn", "Fall"
+
+# WHAT # SEASON #
+"WHAT SEASON", "Winter", "Spring", "Summer", "Autumn", "Fall"
+"WHAT SEASON IS IT", "Winter", "Spring", "Summer", "Autumn", "Fall"
+"DO YOU KNOW WHAT SEASON IT IS", "Winter", "Spring", "Summer", "Autumn", "Fall"
+
+# WHICH # SEASON #
+"WHICH SEASON", "Winter", "Spring", "Summer", "Autumn", "Fall"
+"WHICH SEASON IS IT", "Winter", "Spring", "Summer", "Autumn", "Fall"
+"CAN YOU TELL ME WHICH SEASON IT IS", "Winter", "Spring", "Summer", "Autumn", "Fall"
+
+# WHAT # MONTH #
+"WHAT MONTH", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+"WHAT MONTH IS IT", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+"TELL ME WHAT MONTH IS IT", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+
+# WHICH # MONTH #
+"WHICH MONTH", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+"WHICH MONTH IS IT", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+"TELL ME WHICH MONTH IS IT", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+
+# WHAT # DAY #
+"WHAT DAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# WHICH # DAY #
+"WHICH DAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# TODAY
+"TODAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# WHAT # TODAY
+"WHAT TODAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# WHAT # DAY # TOMORROW
+"WHAT DAY TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# WHAT IS TOMORROW
+"WHAT DAY IS TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# WHICH # DAY # TOMORROW
+"WHICH DAY TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+
+# WHAT # YEAR #
+"WHAT YEAR", "20[0-9][0-9]"
+
+# WHICH # YEAR #
+"WHICH YEAR", "20[0-9][0-9]"
+
+# WHAT # TODAYS DATE #
+
+# WHAT # DATE #
+
+# WHAT # TIME #
diff --git a/bots/y-bot/tests/core/datetime_core.tests b/bots/y-bot/tests/core/datetime_core.tests
new file mode 100644
index 000000000..d0c3c5841
--- /dev/null
+++ b/bots/y-bot/tests/core/datetime_core.tests
@@ -0,0 +1,16 @@
+"SEASON", "Winter", "Spring", "Summer", "Autumn", "Fall"
+"DAY", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"TOMORROW", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"
+"YEAR", "This is [0-9]*"
+"NEXT YEAR", "[0-9]*"
+"LAST YEAR", "[0-9]*"
+"MONTH", "This is [January|February|March|April|May|June|July|August|September|October|November|December]"
+"TIME", "The time is [0-9]{2}:[0-9]{2} [AM|PM]"
+"DATE", "Today is *. [0-9]{2},[0-9]{4}"
+"DAY PHASE", "Morning", "Noon", "Afternoon", "Night", "Midnight"
+"DATE AND TIME", "The date and time is .* .* [0-9]* [0-9]{2}:[0-9]{2}:[0-9]{2} [0-9]{4}"
+"DAYS UNTIL CHRISTMAS", "[0-9]* days until Christmas."
+"DAYS UNTIL JANUARY 01 2020", "[0-9]* days."
+"DAYS UNTIL JANUARY 01", "-?[0-9]* days"
+"DATE TOMORROW", "[0-9]{2},[0-9]{4}"
+
diff --git a/pylint.cfg b/pylint.cfg
index a66661c92..9d1bd44ab 100644
--- a/pylint.cfg
+++ b/pylint.cfg
@@ -7,9 +7,6 @@
 # pygtk.require().
 #init-hook=
 
-# Profiled execution.
-profile=no
-
 # Add files or directories to the blacklist. They should be base names, not
 # paths.
 ignore=CVS
@@ -50,10 +47,6 @@ reports=yes
 # (RP0004).
 evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
 
-# Add a comment according to your evaluation note. This is used by the global
-# evaluation report (RP0004).
-comment=no
-
 # Template used to display messages. This is a python new-style format string
 # used to format the message information. See doc for all details
 #msg-template=
@@ -236,10 +229,6 @@ ignored-modules=
 # (useful for classes with attributes dynamically set).
 ignored-classes=SQLObject
 
-# When zope mode is activated, add a predefined set of Zope acquired attributes
-# to generated-members.
-zope=no
-
 # List of members which are set dynamically and missed by pylint inference
 # system, and so shouldn't trigger E0201 when accessed. Python regular
 # expressions are accepted.
diff --git a/src/programy/clients/test_runner.py b/src/programy/clients/test_runner.py
index 0445a19ed..fe659e13a 100644
--- a/src/programy/clients/test_runner.py
+++ b/src/programy/clients/test_runner.py
@@ -1,6 +1,7 @@
 import logging
 import csv
 import re
+import datetime
 
 from programy.clients.clients import BotClient
 from programy.utils.files.filefinder import FileFinder
@@ -92,13 +93,14 @@ def set_environment(self):
     def run(self):
         print ("Loading Tests from directory [%s]" % self.test_dir)
         file_finder = TestFileFileFinder()
-        collection = file_finder.load_dir_contents(self.test_dir, extension=".tests")
+        collection = file_finder.load_dir_contents(self.test_dir, extension=".tests", subdir=True)
         successes = []
         failures = []
+        start = datetime.datetime.now()
         for category in collection.keys():
             for test in collection[category]:
                 test.category = category
-                response = self.bot.ask_question(self.clientid, test.question).upper()
+                response = self.bot.ask_question(self.clientid, test.question)
                 success = False
                 test.response = response
                 if len(test.answers_regex) == 0:
@@ -114,11 +116,16 @@ def run(self):
                     successes.append(test)
                 else:
                     failures.append(test)
+        stop = datetime.datetime.now()
+        diff = stop-start
+        total_tests = len(successes)+len(failures)
 
         print ("Successes: %d" % len(successes))
         print ("Failures:  %d" % len(failures))
         for failure in failures:
             print ("\t%s: [%s] expected [%s], got [%s]" % (failure.category, failure.question, failure.answers_string, failure.response))
+        print ("Total processing time %f.2 secs"%diff.total_seconds())
+        print ("Thats approx %f tests per sec"%(total_tests/diff.total_seconds()))
 
 if __name__ == '__main__':
 
diff --git a/src/programy/parser/pattern/nodes/base.py b/src/programy/parser/pattern/nodes/base.py
index 87b7b0247..117d4dfb6 100644
--- a/src/programy/parser/pattern/nodes/base.py
+++ b/src/programy/parser/pattern/nodes/base.py
@@ -367,6 +367,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
         if self._topic is not None:
             match = self._topic.consume(bot, clientid, context, words, word_no, Match.TOPIC, depth+1)
             if match is not None:
+                logging.debug("%sMatched topic, success!" % (tabs))
                 return match
             if words.word(word_no) == PatternNode.TOPIC:
                 logging.debug("%s Looking for a %s, none give, no match found!" % (tabs, PatternNode.TOPIC))
@@ -376,6 +377,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
         if self._that is not None:
             match = self._that.consume(bot, clientid, context, words, word_no, Match.THAT, depth+1)
             if match is not None:
+                logging.debug("%sMatched that, success!" % (tabs))
                 return match
             if words.word(word_no) == PatternNode.THAT:
                 logging.debug("%s Looking for a %s, none give, no match found!" % (tabs, PatternNode.THAT))
@@ -392,6 +394,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
 
                 match = child.consume(bot, clientid, context, words, word_no + 1, type, depth+1)
                 if match is not None:
+                    logging.debug("%sMatched child, success!" % (tabs))
                     return match
                 else:
                     context.pop_match ()
@@ -399,6 +402,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
         if self._0ormore_hash is not None:
             match = self._0ormore_hash.consume(bot, clientid, context, words, word_no, type, depth+1)
             if match is not None:
+                logging.debug("%sMatched 0 or more hash, success!" % (tabs))
                 return match
             #else:
             #    context.pop_match ()
@@ -406,6 +410,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
         if self._1ormore_underline is not None:
             match = self._1ormore_underline.consume(bot, clientid, context, words, word_no, type, depth+1)
             if match is not None:
+                logging.debug("%sMatched 1 or more underline, success!" % (tabs))
                 return match
             #else:
             #    context.pop_match ()
@@ -420,6 +425,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
 
                 match = child.consume(bot, clientid, context, words, word_no + 1, type, depth+1)
                 if match is not None:
+                    logging.debug("%sMatched child, success!" % (tabs))
                     return match
                 else:
                     context.pop_match ()
@@ -427,6 +433,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
         if self._0ormore_arrow is not None:
             match = self._0ormore_arrow.consume(bot, clientid, context, words, word_no, type, depth+1)
             if match is not None:
+                logging.debug("%sMatched 0 or more arrow, success!" % (tabs))
                 return match
             #else:
             #    context.pop_match ()
@@ -434,6 +441,7 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
         if self._1ormore_star is not None:
             match = self._1ormore_star.consume(bot, clientid, context, words, word_no, type, depth+1)
             if match is not None:
+                logging.debug("%sMatched 1 or more star, success!" % (tabs))
                 return match
             #else:
             #    context.pop_match ()
diff --git a/src/programy/parser/pattern/nodes/oneormore.py b/src/programy/parser/pattern/nodes/oneormore.py
index b4a0806a2..5faa137a0 100644
--- a/src/programy/parser/pattern/nodes/oneormore.py
+++ b/src/programy/parser/pattern/nodes/oneormore.py
@@ -116,8 +116,13 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
                     if match is not None:
                         return match
 
-            if word == PatternTopicNode.TOPIC or word == PatternThatNode.THAT:
-                logging.debug ("Found a topic or that ar the wrong place....")
+            if word == PatternTopicNode.TOPIC:
+                logging.debug ("Found a topic at the wrong place....")
+                context.pop_matches(matches_add)
+                return None
+
+            if word == PatternThatNode.THAT:
+                logging.debug ("Found a that at the wrong place....")
                 context.pop_matches(matches_add)
                 return None
 
@@ -138,8 +143,13 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
             if match is not None:
                 return match
 
-            if word == PatternTopicNode.TOPIC or word == PatternThatNode.THAT:
-                logging.debug ("Found a topic or that ar the wrong place....")
+            if word == PatternTopicNode.TOPIC:
+                logging.debug ("Found a topic at the wrong place....")
+                context.pop_matches(matches_add)
+                return None
+
+            if word == PatternThatNode.THAT:
+                logging.debug ("Found a that at the wrong place....")
                 context.pop_matches(matches_add)
                 return None
 
diff --git a/src/programy/parser/pattern/nodes/zeroormore.py b/src/programy/parser/pattern/nodes/zeroormore.py
index 72f1e8e04..389d76dd3 100644
--- a/src/programy/parser/pattern/nodes/zeroormore.py
+++ b/src/programy/parser/pattern/nodes/zeroormore.py
@@ -106,8 +106,13 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
                     if match is not None:
                         return match
 
-                    if word == PatternTopicNode.TOPIC or word == PatternThatNode.THAT:
-                        logging.debug ("Found a topic or that ar the wrong place....")
+                    if word == PatternTopicNode.TOPIC :
+                        logging.debug ("1 Found a topic at the wrong place....")
+                        context.pop_matches(matches_added)
+                        return None
+
+                    if word == PatternThatNode.THAT:
+                        logging.debug("Found a that at the wrong place....")
                         context.pop_matches(matches_added)
                         return None
 
@@ -123,8 +128,13 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
             word_no += 1
             word = words.word(word_no)
 
-            if word == PatternTopicNode.TOPIC or word == PatternThatNode.THAT:
-                logging.debug("Found a topic or that ar the wrong place....")
+            if word == PatternTopicNode.TOPIC:
+                logging.debug("2 Found a topic at the wrong place....")
+                context.pop_matches(matches_added)
+                return None
+
+            if word == PatternThatNode.THAT:
+                logging.debug("Found a that at the wrong place....")
                 context.pop_matches(matches_added)
                 return None
 
@@ -148,8 +158,13 @@ def consume(self, bot, clientid, context, words, word_no, type, depth):
             if match is not None:
                 return match
 
-            if word == PatternTopicNode.TOPIC or word == PatternThatNode.THAT:
-                logging.debug("Found a topic or that ar the wrong place....")
+            if word == PatternTopicNode.TOPIC:
+                logging.debug("3 Found a topic at the wrong place....")
+                context.pop_matches(matches_added)
+                return None
+
+            if word == PatternThatNode.THAT:
+                logging.debug("Found a that at the wrong place....")
                 context.pop_matches(matches_added)
                 return None
 
diff --git a/src/programy/utils/newsapi/newsapi.py b/src/programy/utils/newsapi/newsapi.py
index a7f36220f..4bb0f87bd 100644
--- a/src/programy/utils/newsapi/newsapi.py
+++ b/src/programy/utils/newsapi/newsapi.py
@@ -3,40 +3,41 @@
 import requests
 import json
 
+from programy.utils.license.keys import LicenseKeys
 
 class NewsArticle(object):
 
     def __init__(self):
         self.title = None
         self.description = None
-        self.publishedAt = None
+        self.published_at = None
         self.author = None
         self.url = None
-        self.urlToImage = None
+        self.url_to_image = None
 
     def _get_json_attribute(self, data, name, def_value=None):
         if name in data:
             return data[name]
         else:
-            logging.debug ("Attribute [%s] missing from New API Article data"%name)
+            logging.debug("Attribute [%s] missing from New API Article data"%name)
             return def_value
 
     def parse_json(self, data):
         self.title = self._get_json_attribute(data, "title")
         self.description = self._get_json_attribute(data, "description")
-        self.publishedAt = self._get_json_attribute(data, "publishedAt")
+        self.published_at = self._get_json_attribute(data, "publishedAt")
         self.author = self._get_json_attribute(data, "author")
         self.url = self._get_json_attribute(data, "url")
-        self.urlToImage = self._get_json_attribute(data, "urlToImage")
+        self.url_to_image = self._get_json_attribute(data, "urlToImage")
 
     def to_json(self):
         data = {}
         data["title"] = self.title
         data["description"] = self.description
-        data["publishedAt"] = self.publishedAt
+        data["publishedAt"] = self.published_at
         data["author"] = self.author
         data["url"] = self.url
-        data["urlToImage"] = self.urlToImage
+        data["urlToImage"] = self.url_to_image
         return data
 
 # https://newsapi.org/bbc-news-api
@@ -190,24 +191,24 @@ def __init__(self, license_keys):
             raise Exception ("No valid license key METOFFICE_API_KEY found")
 
     @staticmethod
-    def _format_url(service, api_key, sortBy="top"):
-        return NewsAPI.BASE_URL%(service, sortBy, api_key)
+    def _format_url(service, api_key, sort_by="top"):
+        return NewsAPI.BASE_URL%(service, sort_by, api_key)
 
     @staticmethod
-    def _get_data(url_str, api_key, max, sort, reverse):
+    def _get_data(url_str, api_key, max_articles, sort, reverse):
         url = NewsAPI._format_url(url_str, api_key)
-        return NewsAPI._get_news_feed_articles(url, max, sort, reverse)
+        return NewsAPI._get_news_feed_articles(url, max_articles, sort, reverse)
 
     @staticmethod
-    def _get_news_feed_articles(url, max, sort, reverse):
+    def _get_news_feed_articles(url, max_articles, sort, reverse):
         logging.debug("News API URL: [%s]"%url)
         response = requests.get(url)
         articles = []
         if response.status_code == 200:
             header_splits = response.headers['content-type'].split(";")
             if header_splits[0] == 'application/json':
-                json = response.json()
-                for article_data in json['articles']:
+                json_data = response.json()
+                for article_data in json_data['articles']:
                     article = NewsArticle()
                     article.parse_json(article_data)
                     articles.append(article)
@@ -215,11 +216,11 @@ def _get_news_feed_articles(url, max, sort, reverse):
 
                 if sort is True:
                     logging.debug("Sorting articles,, reverse=%s" % str(reverse))
-                    articles.sort(key=lambda article: article.publishedAt, reverse=reverse)
+                    articles.sort(key=lambda article: article.published_at, reverse=reverse)
 
-                if max != 0:
-                    logging.debug("Returning max %d articles" % max)
-                    articles = articles[:max]
+                if max_articles != 0:
+                    logging.debug("Returning max_articles %d articles" % max_articles)
+                    articles = articles[:max_articles]
                 else:
                     logging.debug("Returning all articles")
 
@@ -232,323 +233,323 @@ def _get_news_feed_articles(url, max, sort, reverse):
         return articles
 
     @staticmethod
-    def abc_news_au(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ABC_NEWS_AU, api_key, max, sort, reverse)
+    def abc_news_au(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ABC_NEWS_AU, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def al_jazeera_english(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.AL_JAZEERA_ENGLISH, api_key, max, sort, reverse)
+    def al_jazeera_english(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.AL_JAZEERA_ENGLISH, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def ars_technica(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ARS_TECHNICA, api_key, max, sort, reverse)
+    def ars_technica(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ARS_TECHNICA, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def associated_press(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ASSOCIATED_PRESS, api_key, max, sort, reverse)
+    def associated_press(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ASSOCIATED_PRESS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def bbc_news(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.BBC_NEWS, api_key, max, sort, reverse)
+    def bbc_news(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.BBC_NEWS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def bbc_sport(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.BBC_SPORT, api_key, max, sort, reverse)
+    def bbc_sport(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.BBC_SPORT, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def bloomberg(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.BLOOMBERG, api_key, max, sort, reverse)
+    def bloomberg(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.BLOOMBERG, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def business_insider(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.BUSINESS_INSIDER, api_key, max, sort, reverse)
+    def business_insider(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.BUSINESS_INSIDER, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def business_insider_uk(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.BUSINESS_INSIDER_UK, api_key, max, sort, reverse)
+    def business_insider_uk(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.BUSINESS_INSIDER_UK, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def buzzfeed(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.BUZZFEED, api_key, max, sort, reverse)
+    def buzzfeed(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.BUZZFEED, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def cnbc(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.CNBC, api_key, max, sort, reverse)
+    def cnbc(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.CNBC, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def cnn(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.CNN, api_key, max, sort, reverse)
+    def cnn(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.CNN, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def daily_mail(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.DAILY_MAIL, api_key, max, sort, reverse)
+    def daily_mail(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.DAILY_MAIL, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def engadget(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ENGADGET, api_key, max, sort, reverse)
+    def engadget(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ENGADGET, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def entertainment_weekly(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ENTERTAINMENT_WEEKLY, api_key, max, sort, reverse)
+    def entertainment_weekly(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ENTERTAINMENT_WEEKLY, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def espn(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ESPN, api_key, max, sort, reverse)
+    def espn(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ESPN, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def espn_cric_info(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.ESPN_CRIC_INFO, api_key, max, sort, reverse)
+    def espn_cric_info(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.ESPN_CRIC_INFO, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def financial_times(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.FINANCIAL_TIMES, api_key, max, sort, reverse)
+    def financial_times(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.FINANCIAL_TIMES, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def football_italia(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.FOOTBALL_ITALIA, api_key, max, sort, reverse)
+    def football_italia(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.FOOTBALL_ITALIA, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def fortune(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.FORTUNE, api_key, max, sort, reverse)
+    def fortune(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.FORTUNE, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def four_four_two(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.FOUR_FOUR_TWO, api_key, max, sort, reverse)
+    def four_four_two(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.FOUR_FOUR_TWO, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def fox_sports(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.FOX_SPORTS, api_key, max, sort, reverse)
+    def fox_sports(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.FOX_SPORTS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def google_news(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.GOOGLE_NEWS, api_key, max, sort, reverse)
+    def google_news(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.GOOGLE_NEWS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def hacker_news(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.HACKER_NEWS, api_key, max, sort, reverse)
+    def hacker_news(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.HACKER_NEWS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def ign(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.IGN, api_key, max, sort, reverse)
+    def ign(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.IGN, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def independent(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.INDEPENDENT, api_key, max, sort, reverse)
+    def independent(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.INDEPENDENT, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def mashable(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.MASHABLE, api_key, max, sort, reverse)
+    def mashable(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.MASHABLE, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def metro(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.METRO, api_key, max, sort, reverse)
+    def metro(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.METRO, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def mirror(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.MIRROR, api_key, max, sort, reverse)
+    def mirror(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.MIRROR, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def mtv_news(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.MTV_NEWS, api_key, max, sort, reverse)
+    def mtv_news(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.MTV_NEWS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def mtv_news_uk(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.MTV_NEWS_UK, api_key, max, sort, reverse)
+    def mtv_news_uk(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.MTV_NEWS_UK, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def national_geographic(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.NATIONAL_GEOGRAPHIC, api_key, max, sort, reverse)
+    def national_geographic(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.NATIONAL_GEOGRAPHIC, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def new_scientist(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.NEW_SCIENTIST, api_key, max, sort, reverse)
+    def new_scientist(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.NEW_SCIENTIST, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def newsweek(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.NEWSWEEK, api_key, max, sort, reverse)
+    def newsweek(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.NEWSWEEK, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def new_york_magazine(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.NEW_YORK_MAGAZINE, api_key, max, sort, reverse)
+    def new_york_magazine(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.NEW_YORK_MAGAZINE, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def nfl_news(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.NFL_NEWS, api_key, max, sort, reverse)
+    def nfl_news(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.NFL_NEWS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def polygon(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.POLYGON, api_key, max, sort, reverse)
+    def polygon(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.POLYGON, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def recode(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.RECODE, api_key, max, sort, reverse)
+    def recode(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.RECODE, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def reddit(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.REDDIT_R_ALL, api_key, max, sort, reverse)
+    def reddit(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.REDDIT_R_ALL, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def reuters(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.REUTERS, api_key, max, sort, reverse)
+    def reuters(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.REUTERS, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def talksport(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.TALKSPORT, api_key, max, sort, reverse)
+    def talksport(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.TALKSPORT, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def techcrunch(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.TECHCRUNCH, api_key, max, sort, reverse)
+    def techcrunch(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.TECHCRUNCH, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def techradar(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.TECHRADAR, api_key, max, sort, reverse)
+    def techradar(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.TECHRADAR, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_economist(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_ECONOMIST, api_key, max, sort, reverse)
+    def the_economist(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_ECONOMIST, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_guardian_au(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_GUARDIAN_AU, api_key, max, sort, reverse)
+    def the_guardian_au(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_GUARDIAN_AU, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_guardian_uk(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_GUARDIAN_UK, api_key, max, sort, reverse)
+    def the_guardian_uk(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_GUARDIAN_UK, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_huffington_post(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_HUFFINGTON_POST, api_key, max, sort, reverse)
+    def the_huffington_post(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_HUFFINGTON_POST, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_new_york_times(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_NEW_YORK_TIMES, api_key, max, sort, reverse)
+    def the_new_york_times(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_NEW_YORK_TIMES, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_next_web(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_NEXT_WEB, api_key, max, sort, reverse)
+    def the_next_web(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_NEXT_WEB, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_sport_bible(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_SPORT_BIBLE, api_key, max, sort, reverse)
+    def the_sport_bible(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_SPORT_BIBLE, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_telegraph(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_TELEGRAPH, api_key, max, sort, reverse)
+    def the_telegraph(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_TELEGRAPH, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_verge(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_VERGE, api_key, max, sort, reverse)
+    def the_verge(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_VERGE, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_wall_street_journal(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_WALL_STREET_JOURNAL, api_key, max, sort, reverse)
+    def the_wall_street_journal(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_WALL_STREET_JOURNAL, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def the_washington_post(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.THE_WASHINGTON_POST, api_key, max, sort, reverse)
+    def the_washington_post(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.THE_WASHINGTON_POST, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def time(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.TIME, api_key, max, sort, reverse)
+    def time(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.TIME, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def usa_today(api_key, max, sort, reverse):
-        return NewsAPI._get_data(NewsAPI.USA_TODAY, api_key, max, sort, reverse)
+    def usa_today(api_key, max_articles, sort, reverse):
+        return NewsAPI._get_data(NewsAPI.USA_TODAY, api_key, max_articles, sort, reverse)
 
     @staticmethod
-    def business(api_key, max, sort, reverse):
+    def business(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.bloomberg(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.business_insider(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.business_insider_uk(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.cnbc(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.financial_times(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.fortune(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.the_economist(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.the_wall_street_journal(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.bloomberg(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.business_insider(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.business_insider_uk(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.cnbc(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.financial_times(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.fortune(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.the_economist(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.the_wall_street_journal(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def entertainment(api_key, max, sort, reverse):
+    def entertainment(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.buzzfeed(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.daily_mail(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.entertainment_weekly(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.mashable(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.buzzfeed(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.daily_mail(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.entertainment_weekly(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.mashable(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def gaming(api_key, max, sort, reverse):
+    def gaming(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.ign(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.polygon(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.ign(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.polygon(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def music(api_key, max, sort, reverse):
+    def music(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.mtv_news(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.mtv_news_uk(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.mtv_news(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.mtv_news_uk(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def science_and_nature(api_key, max, sort, reverse):
+    def science_and_nature(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.national_geographic(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.new_scientist(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.national_geographic(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.new_scientist(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def sport(api_key, max, sort, reverse):
+    def sport(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.bbc_sport(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.espn(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.espn_cric_info(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.football_italia(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.four_four_two(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.fox_sports(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.talksport(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.the_sport_bible(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.bbc_sport(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.espn(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.espn_cric_info(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.football_italia(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.four_four_two(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.fox_sports(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.talksport(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.the_sport_bible(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def technology(api_key, max, sort, reverse):
+    def technology(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.ars_technica(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.engadget(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.hacker_news(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.recode(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.techcrunch(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.techradar(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.the_verge(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.ars_technica(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.engadget(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.hacker_news(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.recode(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.techcrunch(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.techradar(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.the_verge(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def uk_news(api_key, max, sort, reverse):
+    def uk_news(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.bbc_news(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.uk_newspapers(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.bbc_news(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.uk_newspapers(api_key, max_articles, sort, reverse))
         return articles
 
     @staticmethod
-    def uk_newspapers(api_key, max, sort, reverse):
+    def uk_newspapers(api_key, max_articles, sort, reverse):
         articles = []
-        articles.extend(NewsAPI.the_guardian_uk(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.mirror(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.the_telegraph(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.daily_mail(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.financial_times(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.independent(api_key, max, sort, reverse))
-        articles.extend(NewsAPI.metro(api_key, max, sort, reverse))
+        articles.extend(NewsAPI.the_guardian_uk(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.mirror(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.the_telegraph(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.daily_mail(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.financial_times(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.independent(api_key, max_articles, sort, reverse))
+        articles.extend(NewsAPI.metro(api_key, max_articles, sort, reverse))
         return articles
 
     def get_headlines(self, source, max=0, sort=False, reverse=False):
 
         if source in self.function_mapping.keys():
             function = self.function_mapping[source]
-            return function(self.api_key, max, sort, reverse)
+            return function(self.api_key, max_articles, sort, reverse)
         else:
-            logging.error ("No source available for %s"%source)
+            logging.error("No source available for %s"%source)
             return []
 
     @staticmethod
@@ -561,13 +562,13 @@ def to_json(articles):
 
     @staticmethod
     def json_to_file(filename, json_data):
-        with open(filename, 'w+') as f:
-            json.dump(json_data, f)
+        with open(filename, 'w+') as json_file:
+            json.dump(json_data, json_file)
 
     @staticmethod
     def json_from_file(filename):
-        with open(filename, 'r+') as f:
-            return json.load(f)
+        with open(filename, 'r+') as json_file:
+            return json.load(json_file)
 
     @staticmethod
     def to_program_y_text(articles, break_str=" <br /> "):
@@ -577,12 +578,10 @@ def to_program_y_text(articles, break_str=" <br /> "):
 
     # Running these tools drops test files into the geocode test folder
 
-    from programy.utils.license.keys import LicenseKeys
+    app_license_keys = LicenseKeys()
+    app_license_keys.load_license_key_file(os.path.dirname(__file__) + '/../../../../bots/y-bot/config/license.keys')
 
-    license_keys = LicenseKeys()
-    license_keys.load_license_key_file(os.path.dirname(__file__) + '/../../../../bots/y-bot/config/license.keys')
-
-    news_api = NewsAPI(license_keys)
+    news_api = NewsAPI(app_license_keys)
 
     results = news_api.get_headlines(NewsAPI.BBC_NEWS)
 
diff --git a/src/test/parser/pattern/matching/test_hash.py b/src/test/parser/pattern/matching/test_hash.py
index bafcd3006..1b0db4584 100644
--- a/src/test/parser/pattern/matching/test_hash.py
+++ b/src/test/parser/pattern/matching/test_hash.py
@@ -99,7 +99,7 @@ def test_hash_front_and_back(self):
         self.assertEqual("F", context.star(1))
         self.assertEqual("G", context.star(2))
 
-    def test_arrow_deep_tree_matching(self):
+    def test_hash_deep_tree_matching(self):
 
         self.add_pattern_to_graph(pattern="A # B # C", topic="X", that="Z", template="1")
         self.add_pattern_to_graph(pattern="A # B # C", topic="X", that="Y", template="1")
@@ -111,4 +111,58 @@ def test_arrow_deep_tree_matching(self):
         self.assertEqual("1", context.template_node().template.word)
 
         self.assertEqual("X1 X2 X3 X4", context.star(1))
-        self.assertEqual("Y1 Y2 Y3 Y4", context.star(2))
\ No newline at end of file
+        self.assertEqual("Y1 Y2 Y3 Y4", context.star(2))
+        
+    def test_hash_at_start_and_end(self):
+
+        self.add_pattern_to_graph(pattern="# A # B #", topic="*", that="*", template="1")
+
+        context = self.match_sentence("A B")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+        context = self.match_sentence("X A B")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+        context = self.match_sentence("A X B")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+        context = self.match_sentence("A B X")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+        context = self.match_sentence("X A X B X")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+    def test_multiple_hash_at_start_and_end(self):
+
+        self.add_pattern_to_graph(pattern="# A # B ^", topic="*", that="*", template="1")
+        self.add_pattern_to_graph(pattern="# A # B # C", topic="*", that="*", template="2")
+
+        context = self.match_sentence("A B")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+        context = self.match_sentence("X A B")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("1", context.template_node().template.word)
+
+        context = self.match_sentence("A B C")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("2", context.template_node().template.word)
+
+        context = self.match_sentence("X A B C")
+        self.assertIsNotNone(context)
+        self.assertIsNotNone(context.template_node())
+        self.assertEqual("2", context.template_node().template.word)