Merge "simplify unit tests implementation of update scenario"