Fixed a bit test cases
Fixed problems in cabal