Tests all passing again for GHC 7.6.3