Add a few more test-suite types