TestChat compatibility fixes

Soon, we're gonna have to actually turn that sucker into a module. Like,
within 3 days :V