More tests and better testing tools