Made some tweaks so that the tests run on older versions of GHC.