Merge pull request #1573 from RosettaCommons/revert-1572-revert-1571-sofibali/sofia_summer_work Reinstate "Sofibali/sofia summer work" carbohydrate test changes expected