Tweaked connection behaviour for definition only tests