#656 - Refactored updateConfigAndWait to accept an object

Also added a unit test for updating multiple fields at the same time