Merge "Updating launch tests"