Tidy up the test-suite definitions

Now we just need a test-suite for this package.