Tweaks to test output + work on rabbit connection in-test