Fixed test failures that resulted from switchordering now returning a new map instead of changing the current one.