More tests and more coverage