Fix broken test runs (and installs)