Organize, and extend, the test suite