Tweaked connection management for testing