Fix test failures due to previous commit