Merge pull request #6805 from remitamine/washingtonpost-tests