Fix the progress formula, re-enable the progress test, and fix an
error in Standard Touch's required CP.