Fix Map/Set tests