Fix control streams persisting across test runs