Fix some tests
Support for template-haskell 2.7