Updating broken tests