Fixing all test suite