Fix further OS dependencies in tests