Update tests to work on GHC 7.6