Added some more tests - I made it easier to switch which communicator is being tested.