some more tests and removed some communicator stuff (rethinking)