Adjust tests to filesystem changes