More corrections to the tests