Converted to FP Complete Haskell Center
Fix tests