Fixed the tests broken by the previous commit