Fix test based on changes