test-out tweaks
more integration with test-out package