Expand tests, make several textual changes
Update CHANGES