Tweak setup tests