Tidied up the maps/queues.  Adding to IntegrationTest.
Reset log levels.