FIX Ensure strict ordering within set_params

This is hard to build an unequivocal test for because it depends on key iteration ordering