Test cleanup. Comments added.