Merge "Fix launcher failing tests."