Adapted tests to reflect the use of the updatewait with expected state.