Remove a few remaining assertSetEquals()