Fix more failing tests after removing elements.