Adjust tests to improve testability on clean systems