Merge "Updating test as per API changes" into ub-launcher3-dorval