Moved stuff around.  A couple of chat_test changes.