Fixing test suite...