More tests, make test comments and names more declarative, do some line wrapping