#119, test fixes for GHC 7.8, perhaps