Fixing test-suite.