Replaced where/order maps with slices due to random iteration order in maps, should fix tests