Merge pull request #6474 from RosettaCommons/roccomoretti/fix_tests Attempt to fix tests in master Assorted changes to fix broken tests in master