pytest

6bf7f555 - Merge pull request #10632 from danigm/fix-tests