Merge pull request #6786 from remitamine/wimp-tests