Should fix test runs