Training: suites fixes

This addresses some more feedback from the first training session.