Make testr happy

DO NOT MERGE THESE

This PR is for informational purposes only. We need to discuss the changes and make cleaner changesets. It might even be simpler to redo the graduation using a new template.