Rework some of the starter league tests a bit. Move cleanup to prep.