Completed exercises to clean up tests