Adjust tests to patch make directories method