Also fixes whitespace.

One of these fails with 6.6

This means we can put package-specific tests in the repository for the
package, rather than putting them in the testsuite.  There should be a
.T file to go with the tests, in the same way as for other tests in
the testsuite (but this could be in addition to a standalone test
driver that works with Cabal's 'setup test').