move weird chatops shit out of deployment
fixup tests