fixed tests, reorder events in Communicator