Tweaks to test-in.