Fix some broken tests under GHC 7.6.3