Merge "Fixing some launcher model tests" into main