More tests and more bugs