Update tests to work on GHC 7.6
Merge branch 'master' into solutions