Moves functions around in htd.py, makes unit tests better#1058

ajax146 merged 3 commits intomainr-Techsupport/TechSupportBot:mainfrom

FixHTDTestsr-Techsupport/TechSupportBot:FixHTDTestsCopy head branch name to clipboard