Moved all tests over to using Messaging Sender/Receiver; Some other cleanup
Normalising tests to cope with slight change to config behaviour