Restructure TestClient to make creating more messages easier