Completed exercises to improve tests