Clean up a test and add additional comments.