Make testing script use testing code again...
Merge branch 'chathistory' into twomoodles