Rollup of test cases/comments/cleanup changes

Nothing arguable here, as far as I can tell.