Merge pull request #8643 from eileenmcnaughton/in_prog_tests