More tests, 99% coverage