Cleaned up mock communicator