Get rid of errors wrt the test suite