Merge pull request #740 from riptano/pcmanus_review-8099_upgrade_tests