comments, renaming, and more robust testing