Merge "Adding test methods" into ub-launcher3-master