Fix the rest of the failing tests.
Fix the rest of the failing tests.

drobati/hayt,desert-planet/hayt,Drewzar/arrakis-hubot,n1ckn4m3/hayt,sbryant/arrakis-hubot,thecodercody/hayt,pmn/hayt,skalnik/hayt,websages/hayt