Re: shell32/tests: Remove shlwapi dependency