Merge testsuite .cabal into main .cabal, twiddle readmes, some cleanups.