Some test fixes
GHC 7.4 patches