test-scenario-hygiene

Use after TDD is finished, to review and clean the testing additions