Exercises to clean up tests