Update Map tests
Update Set tests