Tests pass again for GHC 7.6.3