Temporarily fix an issue in the tests