Clean up comments and remove a confusing additional tag in a test