More tests, more coverage.