prelaunch test improvements
Merge pull request #2175 from sebv/test-prelaunch

prelaunch test improvements