Fix broken tests by last commit