Test cleanup additions.